[node-patches] Change in ovirt-node[master]: Read configured nic from interface files before BOOTIF arg

[fabiand at fedoraproject.org]

Fabian Deutsch has uploaded a new change for review.

Change subject: Read configured nic from interface files before BOOTIF arg
......................................................................

Read configured nic from interface files before BOOTIF arg

rhbz#1053425

Change-Id: I9af651dd5a8d821316b170cd67428e4f5b55a3cd
Signed-off-by: Fabian Deutsch <fabiand at redhat.com>
---
M scripts/ovirt-init-functions.sh.in
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/84/26184/1

diff --git a/scripts/ovirt-init-functions.sh.in b/scripts/ovirt-init-functions.sh.in
index d59cbd4..b696008 100644
--- a/scripts/ovirt-init-functions.sh.in
+++ b/scripts/ovirt-init-functions.sh.in
@@ -893,6 +893,10 @@
                 >> $tmpaug
         fi
     done
+    # block accidental bootif changes on upgrades
+    if [ "$upgrade" != "1"]; then
+        sed -i '/OVIRT_BOOTIF/d' $tmpaug
+    fi
     augtool $tmpaug
     . $OVIRT_DEFAULTS
     if [ "$firstboot" != "1" -a -f /etc/ovirt-crypttab ]; then


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9af651dd5a8d821316b170cd67428e4f5b55a3cd
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at fedoraproject.org>
Gerrit-Reviewer: Joey Boggs <jboggs at redhat.com>