[node-patches] Change in ovirt-node[master]: Clear BOOTIF at the end of a TUI install if it's set

[rbarry at redhat.com]

Ryan Barry has uploaded a new change for review.

Change subject: Clear BOOTIF at the end of a TUI install if it's set
......................................................................

Clear BOOTIF at the end of a TUI install if it's set

TUi installs over PXE should not set OVIRT_BOOTIF persistently,
since it may appear as if the network has been configured
prematurely.

Change-Id: I8483280ac36d5511931808a0bc8ee4bce91b32d3
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=989336
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M src/ovirt/node/installer/core/progress_page.py
1 file changed, 11 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/85/27485/1

diff --git a/src/ovirt/node/installer/core/progress_page.py b/src/ovirt/node/installer/core/progress_page.py
index 24916eb..2117fe1 100644
--- a/src/ovirt/node/installer/core/progress_page.py
+++ b/src/ovirt/node/installer/core/progress_page.py
@@ -20,7 +20,8 @@
 # also available at http://www.gnu.org/copyleft/gpl.html.
 from ovirt.node import plugins, ui, utils
 from ovirt.node.config import defaults
-from ovirt.node.utils import console
+from ovirt.node.utils import console, system
+from ovirt.node.utils.fs import File
 import threading
 
 
@@ -168,6 +169,9 @@
                    self.InstallImageAndBootloader(cfg["boot.device.current"]),
                    self.SetKeyboardLayout(cfg["keyboard.layout"])]
 
+            if system.is_pxe():
+                    tx += [self.ClearBootif()]
+
         elif cfg["method"] in ["upgrade", "downgrade", "reinstall"]:
             tx.title = "Update"
             tx += [self.InstallImageAndBootloader()]
@@ -300,3 +304,9 @@
         def commit(self):
             from ovirt.node.config import migrate
             migrate.MigrateConfigs().translate_all()
+
+    class ClearBootif(utils.Transaction.Element):
+        title = "Removing BOOTIF during TUI install"
+
+        def __init__(self):
+            File("/etc/default/ovirt").sed("/OVIRT_BOOTIF/d")


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8483280ac36d5511931808a0bc8ee4bce91b32d3
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Ryan Barry <rbarry at redhat.com>