[node-patches] Change in ovirt-node[ovirt-3.6]: Unset BOOTIF if it's already set (TUI upgrades)

[rbarry at redhat.com]

Ryan Barry has uploaded a new change for review.

Change subject: Unset BOOTIF if it's already set (TUI upgrades)
......................................................................

Unset BOOTIF if it's already set (TUI upgrades)

If "upgrade" is appended, BOOTIF is already removed, but this does
not carry through to TUI upgrades, since "ugprade" is not set on
the cmdline.

Check whether it's already set (this will be unset in a base
image), and unset it if it is.

Change-Id: I7d64efb10d4f3bbf7d5a482c76675ed56c4eaf10
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1289028
Signed-off-by: Ryan Barry <rbarry at redhat.com>
(cherry picked from commit f32bbe934e16e80d7eaf4b6e9a1ab71998ac8957)
---
M scripts/ovirt-init-functions.sh.in
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/01/55701/1

diff --git a/scripts/ovirt-init-functions.sh.in b/scripts/ovirt-init-functions.sh.in
index 2fab5b1..12d354e 100644
--- a/scripts/ovirt-init-functions.sh.in
+++ b/scripts/ovirt-init-functions.sh.in
@@ -932,7 +932,9 @@
         fi
     done
     # block accidental bootif changes on upgrades
-    if [ "$upgrade" == "1" ]; then
+    grep -sq BOOTIF /etc/default/ovirt
+    bootif_set=$?
+    if [[ "$upgrade" == "1" || $bootif_set -eq 0 ]]; then
         sed -i '/OVIRT_BOOTIF/d' $tmpaug
     fi
     augtool $tmpaug


-- 
To view, visit https://gerrit.ovirt.org/55701
To unsubscribe, visit https://gerrit.ovirt.org/settings

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