[node-patches] Change in ovirt-node[master]: Revert logic changes in ovirt-functions.in

[rbarry at redhat.com]

Ryan Barry has uploaded a new change for review.

Change subject: Revert logic changes in ovirt-functions.in
......................................................................

Revert logic changes in ovirt-functions.in

The installer doesn't like it if the CD liveos is mounted on
/liveos. Don't do it.

Change-Id: Iaa8069299df6d1c77020f3e88ff7bdcb8f25b8bd
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1120650
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1095081
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M scripts/ovirt-functions.in
1 file changed, 1 insertion(+), 11 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/34/32534/1

diff --git a/scripts/ovirt-functions.in b/scripts/ovirt-functions.in
index 9da82a7..435678e 100644
--- a/scripts/ovirt-functions.in
+++ b/scripts/ovirt-functions.in
@@ -356,17 +356,7 @@
         return 0
     fi
     mkdir -p /liveos
-    if grep -vq "CDLABEL" /proc/cmdline; then
-        mount LABEL=Root /liveos || mount -r LABEL=Root /liveos
-    else
-        if mountpoint -q /dev/.initramfs/live; then
-            mount -o bind /dev/.initramfs/live /liveos
-        elif mountpoint -q /run/.initramfs/live; then
-            mount -o bind /run/initramfs/live /liveos
-        else
-            return 1
-        fi
-    fi
+    mount LABEL=Root /liveos || mount -r LABEL=Root /liveos
 }
 
 mount_iscsi_liveos() {


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

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