Ovirt devel - Jul 2009 - [PATCH node] fix mount_live again

fixes install from ISO
---
 scripts/ovirt-functions |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions
index e01ee0e..3f55656 100644
--- a/scripts/ovirt-functions
+++ b/scripts/ovirt-functions
@@ -249,11 +249,13 @@ mount_live() {
         return 0
     fi
     local live_dev=/dev/live
-    if [ ! -e $live_dev ] && losetup /dev/loop0|grep -q
'\.iso'; then
-      # PXE boot
-      live_dev=/dev/loop0
-    else
-      return 1
+    if [ ! -e $live_dev ]
+        if losetup /dev/loop0|grep -q '\.iso'; then
+            # PXE boot
+            live_dev=/dev/loop0
+        else
+            return 1
+        fi
     fi
     mkdir -p /live
     mount -r $live_dev /live || mount $live_dev /live
-- 
1.6.0.6

fixes install from ISO
---
 scripts/ovirt-functions |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions
index e01ee0e..b87cebb 100644
--- a/scripts/ovirt-functions
+++ b/scripts/ovirt-functions
@@ -249,11 +249,13 @@ mount_live() {
         return 0
     fi
     local live_dev=/dev/live
-    if [ ! -e $live_dev ] && losetup /dev/loop0|grep -q
'\.iso'; then
-      # PXE boot
-      live_dev=/dev/loop0
-    else
-      return 1
+    if [ ! -e $live_dev ]; then
+        if losetup /dev/loop0|grep -q '\.iso'; then
+            # PXE boot
+            live_dev=/dev/loop0
+        else
+            return 1
+        fi
     fi
     mkdir -p /live
     mount -r $live_dev /live || mount $live_dev /live
-- 
1.6.0.6