[node-patches] Change in ovirt-node[master]: only run post install hook from ovirtfunctions.py with tui i...

[jboggs at redhat.com]

Joey Boggs has uploaded a new change for review.

Change subject: only run post install hook from ovirtfunctions.py with tui install
......................................................................

only run post install hook from ovirtfunctions.py with tui install

Change-Id: I359d56b284a71b7621062d92321f1d6523edce04
Signed-off-by: Joey Boggs <jboggs at redhat.com>
---
M scripts/ovirtnode/ovirtfunctions.py
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/99/7199/1

diff --git a/scripts/ovirtnode/ovirtfunctions.py b/scripts/ovirtnode/ovirtfunctions.py
index 8b0b9f3..67b545d 100644
--- a/scripts/ovirtnode/ovirtfunctions.py
+++ b/scripts/ovirtnode/ovirtfunctions.py
@@ -192,8 +192,8 @@
 #       if other ip bootparams are not specified, IPv4 DHCP is assumed
 # for storage - OVIRT_INIT, local disk to use
 #       if ovirt_vol is not specified, default volume sizes are set
-def is_auto_install(self):
-    if self.OVIRT_VARS.has_key("OVIRT_BOOTIF") and self.OVIRT_VARS.has_key("OVIRT_INIT"):
+def is_auto_install():
+    if OVIRT_VARS.has_key("OVIRT_BOOTIF") and OVIRT_VARS.has_key("OVIRT_INIT"):
         return True
     else:
         return False
@@ -879,6 +879,8 @@
     #   -O /dev/null
     hookdir="/etc/ovirt-config-boot.d"
     for hook in os.listdir(hookdir):
+        if not is_auto_install():
+            system_closefds(os.path.join(hookdir,hook))
         system_closefds(os.path.join(hookdir,hook))
     for f in ["/etc/ssh/ssh_host%s_key" % t for t in ["", "_dsa", "_rsa"]]:
         ovirt_store_config(f)


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

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