X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=82f5413b053afe5b57716f51c36c172d8cacdaba;hb=refs%2Ftags%2Fupstream%2F3.0_a20;hp=57a4d322c9521d979675cd63eccff9b70db8405e;hpb=967bfeaca7c4f3e28f935b1afbd0cce0878dd559;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 57a4d32..82f5413 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1476,8 +1476,8 @@ setup_unionfs ()
 				unionmountopts="${unionmountopts} ${unionrw}=RW:${unionro}=RO"
 				( sysctl -w fs.file-max=391524 ; ulimit -HSn 16384
 				unionfs-fuse ${unionmountopts} "${unionmountpoint}" ) && \
-					( mkdir -p /run/initramfs
-				pidof unionfs-fuse >> /run/initramfs/sendsigs.omit || true )
+				( mkdir -p /run/sendsigs.omit.d
+				pidof unionfs-fuse >> /run/sendsigs.omit.d/unionfs-fuse || true )
 				;;
 
 			unionmount)
@@ -1590,7 +1590,7 @@ check_dev ()
 				loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
 				devname="${loopdevname}"
 			else
-				echo "Warning: unable to mount $ISO_DEVICE." >>/live.log
+				echo "Warning: unable to mount $ISO_DEVICE." >>/live-boot.log
 			fi
 		fi
 	fi
@@ -1612,6 +1612,35 @@ check_dev ()
 			umount $mountpoint
 		fi
 	fi
+
+	IFS=","
+	for device in ${devname}
+	do
+		case "$device" in
+			*mapper*)
+				# Adding lvm support
+				if [ -x /scripts/local-top/lvm2 ]
+				then
+					ROOT="$device" resume="" /scripts/local-top/lvm2
+				fi
+				;;
+
+			/dev/md*)
+				# Adding raid support
+				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
 
 	if [ -n "${LIVE_MEDIA_OFFSET}" ]