update our patches on top of Debian's 4.0~alpha19

[live-boot-grml.git] / debian / patches / 44_fix_mdadm_usage_for_findiso.patch

diff --git a/debian/patches/44_fix_mdadm_usage_for_findiso.patch b/debian/patches/44_fix_mdadm_usage_for_findiso.patch
deleted file mode 100644 (file)
index cc4ef34..0000000
--- a/debian/patches/44_fix_mdadm_usage_for_findiso.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/scripts/boot/9990-misc-helpers.sh
-+++ b/scripts/boot/9990-misc-helpers.sh
-@@ -202,7 +202,7 @@
-                               # Adding lvm support
-                               if [ -x /scripts/local-top/lvm2 ]
-                               then
--                                      ROOT="$device" resume="" /scripts/local-top/lvm2
-+                                      ROOT="$device" resume="" /scripts/local-top/lvm2 >>/boot.log
-                               fi
-                               ;;
- 
-@@ -210,10 +210,10 @@
-                               # Adding raid support
-                               if [ -x /scripts/local-top/mdadm ]
-                               then
--                                      cp /conf/conf.d/md /conf/conf.d/md.orig
-+                                      [ -r /conf/conf.d/md ] && cp /conf/conf.d/md /conf/conf.d/md.orig
-                                       echo "MD_DEVS=$device " >> /conf/conf.d/md
--                                      /scripts/local-top/mdadm
--                                      mv /conf/conf.d/md.orig /conf/conf.d/md
-+                                      /scripts/local-top/mdadm >>/boot.log
-+                                      [ -r /conf/conf.d/md.orig ] && mv /conf/conf.d/md.orig /conf/conf.d/md
-                               fi
-                               ;;
-               esac