[node-patches] Change in ovirt-node[master]: edit-node move all operations to rootfs before returning sel...

[jboggs at redhat.com]

Joey Boggs has uploaded a new change for review.

Change subject: edit-node move all operations to rootfs before returning selinux to enforcing
......................................................................

edit-node move all operations to rootfs before returning selinux to enforcing

Change-Id: I73c3ef9293ac9cacd64779d66c20cdb3c016d9bf
Signed-off-by: Joey Boggs <jboggs at redhat.com>
---
M tools/edit-node
1 file changed, 14 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/06/20206/1

diff --git a/tools/edit-node b/tools/edit-node
index 7a78f2f..c6a7b33 100755
--- a/tools/edit-node
+++ b/tools/edit-node
@@ -1669,6 +1669,20 @@
                                       "Package : %s" % options.install_dup)
                         failed = True
                         #raise RuntimeError("Unable to Install Package")
+                if not options.password is None:
+                    print "Setting Account Passwords"
+                    editor._set_password(options)
+                if not options.ssh_keys is None:
+                    editor._setup_ssh_keys(options)
+                if not options.uidmod is None:
+                    editor._change_uid(options)
+                if not options.gidmod is None:
+                    editor._change_gid(options)
+                if options.shell:
+                    print "Launching shell. Exit to continue."
+                    print "----------------------------------"
+                    editor.launch_shell()
+
             except RuntimeError as e:
                 raise RuntimeError(e)
             finally:
@@ -1677,19 +1691,6 @@
                     selinux.security_setenforce(1)
                 if failed:
                     sys.exit(1)
-            if not options.password is None:
-                print "Setting Account Passwords"
-                editor._set_password(options)
-            if not options.ssh_keys is None:
-                editor._setup_ssh_keys(options)
-            if not options.uidmod is None:
-                editor._change_uid(options)
-            if not options.gidmod is None:
-                editor._change_gid(options)
-            if options.shell:
-                print "Launching shell. Exit to continue."
-                print "----------------------------------"
-                editor.launch_shell()
             if rebuild == 1:
                 editor._update_version(options)
                 editor._minimize()


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

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