X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fpatches%2F25_support_lvm_for_live-media.patch;h=63b6f0318095c5f69584e4ad20181db600ad9f04;hb=37de4fd22509663ad0237ed15bb5452d2f0e9dc1;hp=db4336c8cbd2e2b74748e40de32664cf5d8d5259;hpb=bc1b3916313d325ce0a2c7b67c1f19498238c44e;p=live-boot-grml.git

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
--- 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