From 7fb9e911caf0acf30c7323245fb5034cdd611676 Mon Sep 17 00:00:00 2001 From: Ulrich Dangel Date: Mon, 13 Jun 2011 00:23:46 +0200 Subject: [PATCH] Support comma delimited devices in live-media-path --- debian/patches/25_support_lvm_for_live-media.patch | 36 +++++++++++++--------- 1 file changed, 22 insertions(+), 14 deletions(-) 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 -- 2.1.4