Drop 14_prefer_removable_devices.dpatch (applied upstream).
authorMichael Prokop <mika@grml.org>
Tue, 11 May 2010 09:08:32 +0000 (11:08 +0200)
committerMichael Prokop <mika@grml.org>
Tue, 11 May 2010 09:08:32 +0000 (11:08 +0200)
debian/patches/00list
debian/patches/14_prefer_removable_devices.dpatch [deleted file]

index ee492ae..af5d4c8 100644 (file)
@@ -5,6 +5,5 @@
 11_dhcphostname.patch
 12_uuid_support.dpatch
 13_always_display_warnings_and_failures.dpatch
-14_prefer_removable_devices.dpatch
 15_support_cciss_in_isofrom.dpatch
 16_do_not_leak_modprobe_options.dpatch
diff --git a/debian/patches/14_prefer_removable_devices.dpatch b/debian/patches/14_prefer_removable_devices.dpatch
deleted file mode 100755 (executable)
index 568221c..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 14_prefer_removable_devices.dpatch by Michael Prokop <mika@grml.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: prefer removable devices over non-removable devices, so scan them first
-
-@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-11 09:21:56.059389954 +0100
-+++ live-initramfs-grml/scripts/live   2010-03-11 10:17:05.482395328 +0100
-@@ -1669,8 +1669,20 @@
-       esac
-       # or do the scan of block devices
-+      # prefer removable devices over non-removable devices, so scan them first
-       for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
-       do
-+              if [ "$(cat ${sysblock}/removable)" = "1" ]
-+              then
-+                      removable_devices_to_scan="$removable_devices_to_scan $sysblock"
-+              else
-+                      nonremovable_devices_to_scan="$nonremovable_devices_to_scan $sysblock"
-+              fi
-+      done
-+      devices_to_scan="$removable_devices_to_scan $nonremovable_devices_to_scan"
-+
-+      for sysblock in $devices_to_scan
-+      do
-               devname=$(sys2dev "${sysblock}")
-               fstype=$(get_fstype "${devname}")