[node-patches] Change in ovirt-node[master]: kdump: Fix kdumpctl call

[fabiand at fedoraproject.org]

Fabian Deutsch has uploaded a new change for review.

Change subject: kdump: Fix kdumpctl call
......................................................................

kdump: Fix kdumpctl call

kdumpctl moved it's location, this lead to problems.

Change-Id: I2a53c98360d56268ccc41018fa8b5816227605ac
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M src/ovirt/node/config/defaults.py
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/66/16666/1

diff --git a/src/ovirt/node/config/defaults.py b/src/ovirt/node/config/defaults.py
index a4d6762..90fac57 100644
--- a/src/ovirt/node/config/defaults.py
+++ b/src/ovirt/node/config/defaults.py
@@ -1044,11 +1044,11 @@
 
                 okdump.write_kdump_config(ssh)
 
-                if os.path.exists("/usr/bin/kdumpctl"):
-                    cmd = "kdumpctl propagate"
+                if any(os.path.exists(p + "/bin/kdumpctl")
+                       for p in ["", "/usr"]):
+                    cmd = ["kdumpctl", "propagate"]
                 else:
-                    cmd = "service kdump propagate"
-                cmd += "2>&1"
+                    cmd = ["service", "kdump", "propagate"]
 
                 try:
                     utils.process.check_call(cmd)
@@ -1094,7 +1094,7 @@
                     self.logger.info("Failure while restarting kdump: %s" % e)
                     unmount_config("/etc/kdump.conf")
                     self.backups.restore("/etc/kdump.conf")
-                    system.service("kdump", "restart")
+                    system.service("kdump", "restart", do_raise=False)
 
                     raise RuntimeError("KDump configuration failed, " +
                                        "location unreachable. Previous " +


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

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