[node-patches] Change in ovirt-node[node-3.0]: setup: Only add journalctl if available

[fabiand at fedoraproject.org]

Fabian Deutsch has uploaded a new change for review.

Change subject: setup: Only add journalctl if available
......................................................................

setup: Only add journalctl if available

Change-Id: I638581ff0e13e64053ea28b4bc4350518fa1b950
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1017029
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M src/ovirt/node/setup/core/support_page.py
1 file changed, 12 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/03/22503/1

diff --git a/src/ovirt/node/setup/core/support_page.py b/src/ovirt/node/setup/core/support_page.py
index 6bf5071..acb60a1 100644
--- a/src/ovirt/node/setup/core/support_page.py
+++ b/src/ovirt/node/setup/core/support_page.py
@@ -20,7 +20,7 @@
 # also available at http://www.gnu.org/copyleft/gpl.html.
 from ovirt.node import ui
 from ovirt.node.plugins import NodePlugin
-from ovirt.node.utils import process
+from ovirt.node.utils import process, system
 
 """
 A plugin for a support page
@@ -85,9 +85,14 @@
                                          contents)
 
     def __debugfiles_to_offer(self):
-        return [("node", "/var/log/ovirt.log"),
-                ("ui", "/tmp/ovirt.debug.log"),
-                ("dmesg", "dmesg"),
-                ("messages", "/var/log/messages"),
-                ("journal", "journal (systemd)"),
-                ("audit", "/var/log/audit/audit.log")]
+        items = [("node", "/var/log/ovirt.log"),
+                 ("ui", "/var/log/ovirt-node.log"),
+                 ("dmesg", "dmesg"),
+                 ("audit", "/var/log/audit/audit.log")]
+
+        if system.has_systemd():
+            items.append(("journal", "journal (systemd)"))
+        else:
+            items.append(("messages", "/var/log/messages"))
+
+        return items


-- 
To view, visit http://gerrit.ovirt.org/22503
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I638581ff0e13e64053ea28b4bc4350518fa1b950
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: node-3.0
Gerrit-Owner: Fabian Deutsch <fabiand at fedoraproject.org>