From: Ulrich Dangel <mru@grml.org>
Date: Sun, 12 Jun 2011 22:23:46 +0000 (+0200)
Subject: Support comma delimited devices in live-media-path
X-Git-Tag: v3.0_a19-1+grml.00~5
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=7fb9e911caf0acf30c7323245fb5034cdd611676

Support comma delimited devices in live-media-path
---

diff --git a/debian/patches/25_support_lvm_for_live-media.patch b/debian/patches/25_support_lvm_for_live-media.patch
index db4336c..d699738 100644
--- a/debian/patches/25_support_lvm_for_live-media.patch
+++ b/debian/patches/25_support_lvm_for_live-media.patch
@@ -8,24 +8,32 @@
 
 --- a/scripts/live
 +++ b/scripts/live
-@@ -1669,6 +1669,21 @@
+@@ -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