Drop debian/patches/07_support_findiso.patch which is in upstream nowadays

diff --git a/debian/patches/07_support_findiso.patch b/debian/patches/07_support_findiso.patch
deleted file mode 100644 (file)
index 13f4314..0000000
--- a/debian/patches/07_support_findiso.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07_support_findiso.dpatch by Michael Schierl <schierlm@gmx.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: support for findoiso bootoption
-# When booting with findiso=/grml_2010.05.iso, it will look for
-# that .iso file on all disks where it usually looks for the .squashfs
-# file. When it is found, the disk containing the iso is read-only mounted
-# as /live/findiso (and exposed there after boot completed). The squashfs
-# file is searched inside that ISO file then.
-
-@DPATCH@
-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
-                               ;;
- 
-+                      findiso=*)
-+                              FINDISO="${ARGUMENT#findiso=}"
-+                              export FINDISO
-+                              ;;
-+
-                       forcepersistentfsck)
-                               FORCEPERSISTENTFSCK="Yes"
-                               export FORCEPERSISTENTFSCK
-@@ -1759,6 +1764,21 @@
-               mount -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue
-               [ -n "$devuid" ] && echo "$devuid" >> $tried
- 
-+              if [ -n "${FINDISO}" ]
-+              then
-+                      if [ -f ${mountpoint}/${FINDISO} ]
-+                      then
-+                              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*" 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
-@@ -2046,6 +2066,22 @@
-       # when booting FAI, this simple workaround solves it
-       ls /root/* >/dev/null 2>&1
- 
-+      # Move findiso directory to the new root filesystem so that programs there can get at it.
-+      if [ -d /live/findiso -a ! -d /root/live/findiso ]
-+      then
-+              mkdir -p /root/live/findiso
-+              mount -n --move /live/findiso /root/live/findiso
-+      fi
-+
-+      # if we do not unmount the ISO we can't run "fsck /dev/ice" later on
-+      # because the mountpoint is left behind in /proc/mounts, so let's get
-+      # rid of it when running from RAM
-+      if [ -n "$FINDISO" ] && [ "${TORAM}" ]
-+      then
-+              losetup -d /dev/loop0
-+              grep -q /live/findiso /proc/mounts && umount /root/live/findiso
-+      fi
-+
-       # copy snapshot configuration if exists
-       if [ -f snapshot.conf ]
-       then

diff --git a/debian/patches/series b/debian/patches/series
index ba40f7a..40b5f11 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 03_grml_version_file_hook.patch
 05_boot_failure_message_grml.patch
-07_support_findiso.patch
 08_grml_defaults.patch
 11_dhcphostname.patch
 12_uuid_support.patch