Drop upstream-applied patch: 01_fix_output_file

[live-boot-grml.git] / debian / patches / 25_support_lvm_for_live-media.patch

diff --git a/debian/patches/25_support_lvm_for_live-media.patch b/debian/patches/25_support_lvm_for_live-media.patch
index db4336c..63b6f03 100644 (file)
--- a/debian/patches/25_support_lvm_for_live-media.patch
+++ b/debian/patches/25_support_lvm_for_live-media.patch
@@ -6,26 +6,36 @@
 
 @DPATCH@
 
---- a/scripts/live
-+++ b/scripts/live
-@@ -1669,6 +1669,21 @@
+Index: b/scripts/live
+===================================================================
+--- a/scripts/live     2011-07-24 22:08:10.000000000 +0200
++++ b/scripts/live     2011-07-24 22:08:11.000000000 +0200
+@@ -1669,6 +1669,29 @@
                        umount $mountpoint
                fi
        fi
 +
-+      case "$devname" in
-+              *mapper*)  # add lvm support
-+              if [ -x /scripts/local-top/lvm2 ] ; then
-+                      ROOT="$devname" resume="" /scripts/local-top/lvm2
-+              fi
-+              ;;
-+              /dev/md*)
-+              if [ -x /scripts/local-top/mdadm ] ; then
-+                      echo "MD_DEVS=$devname" >> /conf/conf.d/md
-+                      /scripts/local-top/mdadm
-+              fi
-+              ;;
-+      esac
++      IFS=","
++      for device in ${devname} ; do
++              case "$device" in
++                      *mapper*)  # add lvm support
++                      if [ -x /scripts/local-top/lvm2 ] ; then
++                              ROOT="$device" resume="" /scripts/local-top/lvm2
++                      fi
++                      ;;
++                      /dev/md*)
++                      if [ -x /scripts/local-top/mdadm ] ; then
++                              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
++                      fi
++                      ;;
++              esac
++      done
++      unset IFS
++
++      [ -n "$device" ] && devname="$device"
 +
        [ -e "$devname" ] || continue