Drop 15_support_cciss_in_isofrom.dpatch (applied upstream).

diff --git a/debian/patches/00list b/debian/patches/00list
index af5d4c8..ecd43f2 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -5,5 +5,4 @@
 11_dhcphostname.patch
 12_uuid_support.dpatch
 13_always_display_warnings_and_failures.dpatch
-15_support_cciss_in_isofrom.dpatch
 16_do_not_leak_modprobe_options.dpatch

diff --git a/debian/patches/15_support_cciss_in_isofrom.dpatch b/debian/patches/15_support_cciss_in_isofrom.dpatch
deleted file mode 100755 (executable)
index 6df4df6..0000000
--- a/debian/patches/15_support_cciss_in_isofrom.dpatch
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 15_support_cciss_in_isofrom.dpatch by Michael Prokop <mika@grml.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Support unusual device names like /dev/cciss/c0d0p1 in isofrom bootoption.
-
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' live-initramfs-grml~/scripts/live live-initramfs-grml/scripts/live
---- live-initramfs-grml~/scripts/live  2010-03-23 02:23:29.802852345 +0100
-+++ live-initramfs-grml/scripts/live   2010-03-23 02:24:27.996164127 +0100
-@@ -1537,12 +1537,31 @@
-       # support for fromiso=.../isofrom=....
-       if [ -n "$FROMISO" ]
-       then
--              mkdir /isofrom
--              ISO_DEVICE="$(echo $FROMISO | sed 's|\(/dev/[a-z]*[0-9]*\).*|\1|')"
--              mount "$ISO_DEVICE" /isofrom
--              ISO_NAME="$(echo $FROMISO | sed 's|/dev/[a-z]*[0-9]*/||')"
--              loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
--              devname="${loopdevname}"
-+              ISO_DEVICE=$(dirname $FROMISO)
-+              if ! [ -b $ISO_DEVICE ]
-+              then
-+                      # to support unusual device names like /dev/cciss/c0d0p1
-+                      # as well we have to identify the block device name, let's
-+                      # do that for up to 15 levels
-+                      i=15
-+                      while [ -n "$ISO_DEVICE" ] && [ "$i" -gt 0 ]
-+                      do
-+                              ISO_DEVICE=$(dirname ${ISO_DEVICE})
-+                              [ -b "$ISO_DEVICE" ] && break
-+                              i=$(($i -1))
-+                      done
-+              fi
-+
-+              if [ "$ISO_DEVICE" = "/" ]
-+              then
-+                      echo "Warning: device for bootoption isofrom= ($FROMISO) not found.">>/live.log
-+              else
-+                      mkdir /isofrom
-+                      mount "$ISO_DEVICE" /isofrom
-+                      ISO_NAME="$(echo $FROMISO | sed "s|$ISO_DEVICE||")"
-+                      loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
-+                      devname="${loopdevname}"
-+              fi
-       fi
- 
-       if [ -z "${devname}" ]