07_support_findiso: remove upstream-applied parts

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

diff --git a/debian/patches/07_support_findiso.patch b/debian/patches/07_support_findiso.patch
old mode 100755 (executable)
new mode 100644 (file)
index 540165f..13f4314
--- a/debian/patches/07_support_findiso.patch
+++ b/debian/patches/07_support_findiso.patch
@@ -10,11 +10,11 @@
 # file is searched inside that ISO file then.
 
 @DPATCH@
-diff --git a/scripts/live b/scripts/live
-index 5681362..12e795b 100755
---- a/scripts/live
-+++ b/scripts/live
-@@ -106,6 +106,11 @@ Arguments ()
+Index: live-boot-grml/scripts/live
+===================================================================
+--- live-boot-grml.orig/scripts/live   2011-12-06 21:34:27.000000000 +0100
++++ live-boot-grml/scripts/live        2011-12-06 21:48:28.000000000 +0100
+@@ -106,6 +106,11 @@
                                export FETCH
                                ;;
  
@@ -26,7 +26,7 @@ index 5681362..12e795b 100755
                        forcepersistentfsck)
                                FORCEPERSISTENTFSCK="Yes"
                                export FORCEPERSISTENTFSCK
-@@ -1629,13 +1634,28 @@ check_dev ()
+@@ -1759,6 +1764,21 @@
                mount -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue
                [ -n "$devuid" ] && echo "$devuid" >> $tried
  
@@ -48,15 +48,7 @@ index 5681362..12e795b 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 ()
+@@ -2046,6 +2066,22 @@
        # when booting FAI, this simple workaround solves it
        ls /root/* >/dev/null 2>&1