Dont show an error message if /live/image is already unmounted.
authorUlrich Dangel <mru@grml.org>
Sun, 5 Jun 2011 01:06:50 +0000 (03:06 +0200)
committerUlrich Dangel <mru@grml.org>
Sun, 5 Jun 2011 01:06:50 +0000 (03:06 +0200)
debian/patches/07_support_findiso.dpatch

index 75e7c50..540165f 100755 (executable)
@@ -11,7 +11,7 @@
 
 @DPATCH@
 diff --git a/scripts/live b/scripts/live
-index 5681362..86a0ce6 100755
+index 5681362..12e795b 100755
 --- a/scripts/live
 +++ b/scripts/live
 @@ -106,6 +106,11 @@ Arguments ()
@@ -26,7 +26,7 @@ index 5681362..86a0ce6 100755
                        forcepersistentfsck)
                                FORCEPERSISTENTFSCK="Yes"
                                export FORCEPERSISTENTFSCK
-@@ -1629,6 +1634,21 @@ check_dev ()
+@@ -1629,13 +1634,28 @@ check_dev ()
                mount -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue
                [ -n "$devuid" ] && echo "$devuid" >> $tried
  
@@ -48,6 +48,14 @@ index 5681362..86a0ce6 100755
                if is_live_path ${mountpoint} && \
                        ([ "${skip_uuid_check}" ] || matches_uuid ${mountpoint})
                then
+                       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