[node-patches] Change in ovirt-node[master]: kdump: catch keyboard interupts when configuring ssh

[jboggs at redhat.com]

Joey Boggs has uploaded a new change for review.

Change subject: kdump: catch keyboard interupts when configuring ssh
......................................................................

kdump: catch keyboard interupts when configuring ssh

rhbz#869513

Change-Id: I8f1929e8bb112058e0db0cfaa058d26463b7aaf2
Signed-off-by: Joey Boggs <jboggs at redhat.com>
---
M scripts/ovirt-config-setup.py
1 file changed, 10 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/97/9597/1

diff --git a/scripts/ovirt-config-setup.py b/scripts/ovirt-config-setup.py
index 6069464..1bec034 100755
--- a/scripts/ovirt-config-setup.py
+++ b/scripts/ovirt-config-setup.py
@@ -1876,13 +1876,16 @@
                 kdump_prop_cmd = "kdumpctl propagate"
             else:
                 kdump_prop_cmd = "service kdump propagate"
-            propagate_proc = passthrough("clean; %s" % kdump_prop_cmd, logger.debug)
-            ret = propagate_proc.retval
-            if ret == 0:
-                ovirt_store_config("/root/.ssh/kdump_id_rsa.pub")
-                ovirt_store_config("/root/.ssh/kdump_id_rsa")
-                ovirt_store_config("/root/.ssh/known_hosts")
-                ovirt_store_config("/root/.ssh/config")
+            try:
+                propagate_proc = passthrough("clean; %s" % kdump_prop_cmd, logger.debug)
+                ret = propagate_proc.retval
+                if ret == 0:
+                    ovirt_store_config("/root/.ssh/kdump_id_rsa.pub")
+                    ovirt_store_config("/root/.ssh/kdump_id_rsa")
+                    ovirt_store_config("/root/.ssh/known_hosts")
+                    ovirt_store_config("/root/.ssh/config")
+            except KeyboardInterrupt:
+                ret = 1
         elif self.kdump_restore_type.value() == 1:
             restore_kdump_config()
         else:


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f1929e8bb112058e0db0cfaa058d26463b7aaf2
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Joey Boggs <jboggs at redhat.com>