[node-patches] Change in ovirt-node[master]: edit-node:Launching shell before the state of selinux reset ...

[hadong0720 at gmail.com]

hadong has uploaded a new change for review.

Change subject: edit-node:Launching shell before the state of selinux reset back
......................................................................

edit-node:Launching shell before the state of selinux reset back

Previously when using --shell option, edit-node change to permissive on the
build machine if it's enforcing, then reset back.Launching shell in the end.
Now fix it launching shell before the state of selinux reset back

Change-Id: I36da71464931f8c8bdd202dff63b1779f8218f12
Signed-off-by: hadong <hadong0720 at gmail.com>
---
M tools/edit-node
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/61/19961/1

diff --git a/tools/edit-node b/tools/edit-node
index 7a78f2f..3eaf035 100755
--- a/tools/edit-node
+++ b/tools/edit-node
@@ -1669,6 +1669,10 @@
                                       "Package : %s" % options.install_dup)
                         failed = True
                         #raise RuntimeError("Unable to Install Package")
+                if options.shell:
+                    print "Launching shell. Exit to continue."
+                    print "----------------------------------"
+                    editor.launch_shell()
             except RuntimeError as e:
                 raise RuntimeError(e)
             finally:
@@ -1686,10 +1690,6 @@
                 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/19961
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I36da71464931f8c8bdd202dff63b1779f8218f12
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: hadong <hadong0720 at gmail.com>