Dont show an error message if /live/image is already unmounted.

[live-boot-grml.git] / debian / patches / 07_support_findiso.dpatch

diff --git a/debian/patches/07_support_findiso.dpatch b/debian/patches/07_support_findiso.dpatch
index bceb699..540165f 100755 (executable)
--- a/debian/patches/07_support_findiso.dpatch
+++ b/debian/patches/07_support_findiso.dpatch
@@ -11,12 +11,12 @@
 
 @DPATCH@
 diff --git a/scripts/live b/scripts/live
-index d79beed..04ad61e 100755
+index 5681362..12e795b 100755
 --- a/scripts/live
 +++ b/scripts/live
-@@ -102,6 +102,11 @@ Arguments ()
-                                 export FETCH
-                                 ;;
+@@ -106,6 +106,11 @@ Arguments ()
+                               export FETCH
+                               ;;
  
 +                      findiso=*)
 +                              FINDISO="${ARGUMENT#findiso=}"
@@ -26,7 +26,7 @@ index d79beed..04ad61e 100755
                        forcepersistentfsck)
                                FORCEPERSISTENTFSCK="Yes"
                                export FORCEPERSISTENTFSCK
-@@ -1526,6 +1531,19 @@ check_dev ()
+@@ -1629,13 +1634,28 @@ check_dev ()
                mount -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue
                [ -n "$devuid" ] && echo "$devuid" >> $tried
  
@@ -37,20 +37,26 @@ index d79beed..04ad61e 100755
 +                              umount ${mountpoint}
 +                              mkdir /live/findiso -p
 +                              mount -t ${fstype} -o ro,noatime "${devname}" /live/findiso
-+                              loopdevname=$(setup_loop "/live/findiso/${FINDISO}" "loop" "/sys/block/loop*" "" '')
++                              loopdevname=$(setup_loop "/live/findiso/${FINDISO}" "loop" "/sys/block/loop*" 0 "")
 +                              devname="${loopdevname}"
 +                              mount -t iso9660 -o ro,noatime "${devname}" ${mountpoint}
++                      else
++                              umount ${mountpoint}
 +                      fi
 +              fi
 +
                if is_live_path ${mountpoint} && \
                        ([ "${skip_uuid_check}" ] || matches_uuid ${mountpoint})
                then
-diff --git a/scripts/live b/scripts/live
-index d79beed..d19a5c5 100755
---- a/scripts/live
-+++ b/scripts/live
-@@ -1831,6 +1831,22 @@ mountroot ()
+                       echo ${mountpoint}
+                       return 0
+               else
+-                      umount ${mountpoint}
++                      umount ${mountpoint} 2>/dev/null
+               fi
+       fi
+ 
+@@ -1933,6 +1953,22 @@ mountroot ()
        # when booting FAI, this simple workaround solves it
        ls /root/* >/dev/null 2>&1