X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=2dc0a7e65c252cb4fbd083f770d09ddc9502dcc7;hb=c35d9f0f24c12dc26698bbdad9942e671765d389;hp=d79beed6e428b495c25426f4f8bd3487c5db4818;hpb=0200a64bbb81fd8cf9b9ad7f2c72439c43235e39;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index d79beed..2dc0a7e 100755
--- a/scripts/live
+++ b/scripts/live
@@ -68,6 +68,10 @@ Arguments ()
 				export DEFCONSOLE
 				;;
 
+			BOOTIF=*)
+				BOOTIF="${x#BOOTIF=}"
+				;;
+
 			debug)
 				DEBUG="Yes"
 				export DEBUG
@@ -98,9 +102,9 @@ Arguments ()
 				;;
 
 			fetch=*)
-                                FETCH="${ARGUMENT#fetch=}"
-                                export FETCH
-                                ;;
+				FETCH="${ARGUMENT#fetch=}"
+				export FETCH
+				;;
 
 			forcepersistentfsck)
 				FORCEPERSISTENTFSCK="Yes"
@@ -115,7 +119,7 @@ Arguments ()
 			httpfs=*)
 				HTTPFS="${ARGUMENT#httpfs=}"
 				export HTTPFS
-                                ;;
+				;;
 
 			iscsi=*)
 				ISCSI="${ARGUMENT#iscsi=}"
@@ -226,6 +230,10 @@ Arguments ()
 				export NONETWORKING
 				;;
 
+			ramdisk-size=*)
+				ramdisk_size="${ARGUMENT#ramdisk-size=}"
+				;;
+
 			swapon)
 				SWAPON="Yes"
 				export SWAPON
@@ -245,6 +253,11 @@ Arguments ()
 				export PERSISTENT
 				;;
 
+			persistent-media=*)
+				PERSISTENT_MEDIA="${ARGUMENT#*=}"
+				export PERSISTENT_MEDIA
+				;;
+
 			persistent-path=*)
 				PERSISTENT_PATH="${ARGUMENT#persistent-path=}"
 				export PERSISTENT_PATH
@@ -262,6 +275,16 @@ Arguments ()
 				export NOPERSISTENT
 				;;
 
+			noprompt)
+				NOPROMPT="Yes"
+				export NOPROMPT
+				;;
+
+			noprompt=*)
+				NOPROMPT="${ARGUMENT#noprompt=}"
+				export NOPROMPT
+				;;
+
 			quickusbmodules)
 				QUICKUSBMODULES="Yes"
 				export QUICKUSBMODULES
@@ -321,9 +344,9 @@ Arguments ()
 				;;
 
 			skipunion)
-                                SKIP_UNION_MOUNTS="Yes"
-                                export SKIP_UNION_MOUNTS
-                                ;;
+				SKIP_UNION_MOUNTS="Yes"
+				export SKIP_UNION_MOUNTS
+				;;
 
 			root=*)
 				ROOT="${ARGUMENT#root=}"
@@ -462,7 +485,7 @@ is_nice_device ()
 {
 	sysfs_path="${1#/sys}"
 
-	if /lib/udev/path_id "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-|platform-sata_mv|platform-orion-ehci|platform-mmc|platform-mxsdhci|)"
+	if /lib/udev/path_id "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-[^-]*-(ide|sas|scsi|usb|virtio)|platform-sata_mv|platform-orion-ehci|platform-mmc|platform-mxsdhci)"
 	then
 		return 0
 	elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'
@@ -471,6 +494,9 @@ is_nice_device ()
 	elif echo ${sysfs_path} | grep -q "^/block/dm-"
 	then
 		return 0
+	elif echo ${sysfs_path} | grep -q "^/block/mtdblock"
+	then
+		return 0
 	fi
 
 	return 1
@@ -525,6 +551,13 @@ copy_live_to ()
 		return 1
 	fi
 
+	# Custom ramdisk size
+	if [ -z "${mount_options}" ] && [ -n "${ramdisk_size}" ]
+	then
+		# FIXME: should check for wrong values
+		mount_options="-o size=${ramdisk_size}"
+	fi
+
 	# begin copying (or uncompressing)
 	mkdir "${copyto}"
 	log_begin_msg "mount -t ${fstype} ${mount_options} ${dev} ${copyto}"
@@ -577,10 +610,61 @@ do_netsetup ()
 	udevadm trigger
 	udevadm settle
 
+	[ -n "$ETHDEV_TIMEOUT" ] || ETHDEV_TIMEOUT=15
+	echo "Using timeout of $ETHDEV_TIMEOUT seconds for network configuration."
+
 	if [ -z "${NETBOOT}" ] && [ -z "${FETCH}" ] && \
 	   [ -z "${HTTPFS}" ] && [ -z "${FTPFS}" ]
 	then
 
+
+	# support for Syslinux IPAPPEND parameter
+	# it sets the BOOTIF variable on the kernel parameter
+
+	if [ -n "${BOOTIF}" ]
+	then
+		# pxelinux sets BOOTIF to a value based on the mac address of the
+		# network card used to PXE boot, so use this value for DEVICE rather
+		# than a hard-coded device name from initramfs.conf. this facilitates
+		# network booting when machines may have multiple network cards.
+		# pxelinux sets BOOTIF to 01-$mac_address
+
+		# strip off the leading "01-", which isn't part of the mac
+		# address
+		temp_mac=${BOOTIF#*-}
+
+		# convert to typical mac address format by replacing "-" with ":"
+		bootif_mac=""
+		IFS='-'
+		for x in $temp_mac
+		do
+			if [ -z "$bootif_mac" ]
+			then
+				bootif_mac="$x"
+			else
+				bootif_mac="$bootif_mac:$x"
+			fi
+		done
+		unset IFS
+
+		# look for devices with matching mac address, and set DEVICE to
+		# appropriate value if match is found.
+
+		for device in /sys/class/net/*
+		do
+			if [ -f "$device/address" ]
+			then
+				current_mac=$(cat "$device/address")
+
+				if [ "$bootif_mac" = "$current_mac" ]
+				then
+					DEVICE=${device##*/}
+					break
+				fi
+			fi
+		done
+	fi
+
 	# if ethdevice was not specified on the kernel command line
 	# make sure we try to get a working network configuration
 	# for *every* present network device (except for loopback of course)
@@ -599,9 +683,6 @@ do_netsetup ()
 		devlist="$devlist $device"
 	done
 
-	[ -n "$ETHDEV_TIMEOUT" ] || ETHDEV_TIMEOUT=15
-	echo "Using timeout of $ETHDEV_TIMEOUT seconds for network configuration."
-
 	# this is tricky (and ugly) because ipconfig sometimes just hangs/runs into
 	# an endless loop; iff execution fails give it two further tries, that's
 	# why we use '$devlist $devlist $devlist' for the other for loop
@@ -625,45 +706,57 @@ do_netsetup ()
 	done
 
 	else
-	ipconfig ${DEVICE} | tee /netboot.config
-	fi
-
-	# source relevant ipconfig output
-	OLDHOSTNAME=${HOSTNAME}
-	. /tmp/net-${DEVICE}.conf
-	[ -z ${HOSTNAME} ] && HOSTNAME=${OLDHOSTNAME}
-	export HOSTNAME
-
-	if [ -n "${DEVICE}" ]
-	then
-		HWADDR="$(cat /sys/class/net/${DEVICE}/address)"
+		for interface in ${DEVICE}; do
+			ipconfig -t "$ETHDEV_TIMEOUT" ${interface} | tee /netboot-${interface}.config
+			[ -e /tmp/net-${interface}.conf ] && . /tmp/net-${interface}.conf
+			if [ "$IPV4ADDR" != "0.0.0.0" ]
+			then
+				break
+			fi
+		done
 	fi
 
-	if [ ! -e "/etc/resolv.conf" ]
-	then
-		echo "Creating /etc/resolv.conf"
+	for interface in ${DEVICE}; do
+		# source relevant ipconfig output
+		OLDHOSTNAME=${HOSTNAME}
+		[ -e /tmp/net-${interface}.conf ] && . /tmp/net-${interface}.conf
+		[ -z ${HOSTNAME} ] && HOSTNAME=${OLDHOSTNAME}
+		export HOSTNAME
 
-		if [ -n "${DNSDOMAIN}" ]
+		if [ -n "${interface}" ]
 		then
-			echo "domain ${DNSDOMAIN}" > /etc/resolv.conf
-			echo "search ${DNSDOMAIN}" > /etc/resolv.conf
+			HWADDR="$(cat /sys/class/net/${interface}/address)"
 		fi
 
-		for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1}
-		do
-			echo "nameserver $i" >> /etc/resolv.conf
-		done
-	fi
+		if [ ! -e "/etc/resolv.conf" ]
+		then
+			echo "Creating /etc/resolv.conf"
 
-	# Check if we have a network device at all
-	if ! ls /sys/class/net/"$DEVICE" > /dev/null 2>&1 && \
-	   ! ls /sys/class/net/eth0 > /dev/null 2>&1 && \
-	   ! ls /sys/class/net/wlan0 > /dev/null 2>&1 && \
-	   ! ls /sys/class/net/ath0 > /dev/null 2>&1 && \
-	   ! ls /sys/class/net/ra0 > /dev/null 2>&1
-	then
-		panic "No supported network device found, maybe a non-mainline driver is required."
-	fi
+			if [ -n "${DNSDOMAIN}" ]
+			then
+				echo "domain ${DNSDOMAIN}" > /etc/resolv.conf
+				echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
+			fi
+
+			for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1}
+			do
+				if [ -n "$i" ] && [ "$i" != 0.0.0.0 ]
+				then
+					echo "nameserver $i" >> /etc/resolv.conf
+				fi
+			done
+		fi
+
+		# Check if we have a network device at all
+		if ! ls /sys/class/net/"$interface" > /dev/null 2>&1 && \
+		   ! ls /sys/class/net/eth0 > /dev/null 2>&1 && \
+		   ! ls /sys/class/net/wlan0 > /dev/null 2>&1 && \
+		   ! ls /sys/class/net/ath0 > /dev/null 2>&1 && \
+		   ! ls /sys/class/net/ra0 > /dev/null 2>&1
+		then
+			panic "No supported network device found, maybe a non-mainline driver is required."
+		fi
+	done
 }
 
 do_netmount()
@@ -713,7 +806,7 @@ do_iscsi()
 	[ "${DEBUG}" == "Yes" ] && debugopt="-d 8"
 	#FIXME this name is supposed to be unique - some date + ifconfig hash?
 	ISCSI_INITIATORNAME="iqn.1993-08.org.debian.live:01:$(echo "${HWADDR}" | sed -e s/://g)"
-        export ISCSI_INITIATORNAME
+	export ISCSI_INITIATORNAME
 	if [ -n "${ISCSI_SERVER}" ] ; then
 		iscsistart $debugopt -i "${ISCSI_INITIATORNAME}" -t "${ISCSI_TARGET}" -g 1 -a "${ISCSI_SERVER}" -p "${ISCSI_PORT}"
 	else
@@ -945,23 +1038,24 @@ find_snap ()
 	# Look for ${snap_label}.* in block devices
 	snap_label="${1}"
 	black_listed_devices="${2}"
+	white_listed_devices="${3}"
 
 	if [ "${PERSISTENT}" != "nofiles" ]
 	then
 		# search for image files
-		snapdata=$(find_files "${PERSISTENT_PATH}${snap_label}.squashfs ${PERSISTENT_PATH}${snap_label}.cpio.gz ${PERSISTENT_PATH}${snap_label}.ext2 ${PERSISTENT_PATH}${snap_label}.ext3 ${PERSISTENT_PATH}${snap_label}.ext4 ${PERSISTENT_PATH}${snap_label}.jffs2" "${black_listed_devices}")
+		snapdata=$(find_files "${PERSISTENT_PATH}${snap_label}.squashfs ${PERSISTENT_PATH}${snap_label}.cpio.gz ${PERSISTENT_PATH}${snap_label}.ext2 ${PERSISTENT_PATH}${snap_label}.ext3 ${PERSISTENT_PATH}${snap_label}.ext4 ${PERSISTENT_PATH}${snap_label}.jffs2" "${black_listed_devices}" "${white_listed_devices}")
 	fi
 
 	if [ -z "${snapdata}" ]
 	then
-		snapdata=$(find_cow_device "${snap_label}" "${black_listed_devices}")
+		snapdata=$(find_cow_device "${snap_label}" "${black_listed_devices}" "${white_listed_devices}")
 	fi
 	echo "${snapdata}"
 }
 
 try_snap ()
 {
-        # copy the contents of previously found snapshot to ${snap_mount}
+	# copy the contents of previously found snapshot to ${snap_mount}
 	# and remember the device and filename for resync on exit in live-boot.init
 
 	snapdata="${1}"
@@ -1077,7 +1171,7 @@ setup_unionfs ()
 {
 	image_directory="${1}"
 	rootmnt="${2}"
-        addimage_directory="${3}"
+	addimage_directory="${3}"
 
 	case ${UNIONTYPE} in
 		aufs|unionfs)
@@ -1106,7 +1200,6 @@ setup_unionfs ()
 	croot="/"
 
 	# Let's just mount the read-only file systems first
-	rofsstring=""
 	rofslist=""
 
 	if [ "${UNIONTYPE}" = "aufs" ]
@@ -1166,7 +1259,7 @@ setup_unionfs ()
 			image_string="$(echo ${image_string} | sed -e 's/ /\n/g' | sort )"
 		fi
 
-	[ -n "${MODULETORAMFILE}" ] && image_string="${image_directory}/$(basename ${MODULETORAMFILE})"
+		[ -n "${MODULETORAMFILE}" ] && image_string="${image_directory}/$(basename ${MODULETORAMFILE})"
 
 		mkdir -p "${croot}"
 
@@ -1183,7 +1276,6 @@ setup_unionfs ()
 			if [ -d "${image}" ]
 			then
 				# it is a plain directory: do nothing
-				rofsstring="${image}=${roopt}:${rofsstring}"
 				rofslist="${image} ${rofslist}"
 			elif [ -f "${image}" ]
 			then
@@ -1209,9 +1301,10 @@ setup_unionfs ()
 				if [ "${UNIONTYPE}" != "unionmount" ]
 				then
 					mpoint="${croot}/${imagename}"
-					rofsstring="${mpoint}=${roopt}:${rofsstring}" && rofslist="${mpoint} ${rofslist}"
+					rofslist="${mpoint} ${rofslist}"
 				else
 					mpoint="${rootmnt}"
+					rofslist="${rootmnt} ${rofslist}"
 				fi
 				mkdir -p "${mpoint}"
 				log_begin_msg "Mounting \"${image}\" on \"${mpoint}\" via \"${backdev}\""
@@ -1223,19 +1316,20 @@ setup_unionfs ()
 		# we have a plain root system
 		mkdir -p "${croot}/filesystem"
 		log_begin_msg "Mounting \"${image_directory}\" on \"${croot}/filesystem\""
-		mount -t $(get_fstype "${image_directory}") -o ro,noatime "${image_directory}" "${croot}/filesystem" || panic "Can not mount ${image_directory} on ${croot}/filesystem" && rofsstring="${croot}/filesystem=${roopt}:${rofsstring}" && rofslist="${croot}/filesystem ${rofslist}"
+		mount -t $(get_fstype "${image_directory}") -o ro,noatime "${image_directory}" "${croot}/filesystem" || \
+			panic "Can not mount ${image_directory} on ${croot}/filesystem" && \
+			rofslist="${croot}/filesystem ${rofslist}"
 		# probably broken:
 		mount -o bind ${croot}/filesystem $mountpoint
 		log_end_msg
 	fi
 
-	rofsstring=${rofsstring%:}
-
 	mkdir -p /cow
 
 	# Looking for "${root_persistence}" device or file
 	if [ -n "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ]
 	then
+
 		if [ -z "${QUICKUSBMODULES}" ]
 		then
 			# Load USB modules
@@ -1263,8 +1357,20 @@ setup_unionfs ()
 			done
 		fi
 
+		case "${PERSISTENT_MEDIA}" in
+			removable)
+				whitelistdev="$(removable_dev)"
+				;;
+			removable-usb)
+				whitelistdev="$(removable_usb_dev)"
+				;;
+			*)
+				whitelistdev=""
+				;;
+		esac
+
 		# search for label and files (this could be hugely optimized)
-		cowprobe=$(find_cow_device "${root_persistence}")
+		cowprobe=$(find_cow_device "${root_persistence}" "${blacklistdev}" "${whitelistdev}")
 		if [ -b "${cowprobe}" ]
 		then
 			# Blacklist /cow device, to avoid inconsistent setups for overlapping snapshots
@@ -1276,17 +1382,17 @@ setup_unionfs ()
 			export PERSISTENCE_IS_ON
 		fi
 		# homecow just mount something on /home, this should be generalized some way
-		homecow=$(find_cow_device "${home_persistence}" "${blacklistdev}")
+		homecow=$(find_cow_device "${home_persistence}" "${blacklistdev}" "${whitelistdev}")
 		if [ -b "${homecow}" ]
 		then
 			PERSISTENCE_IS_ON="1"
 			export PERSISTENCE_IS_ON
 		fi
-		root_snapdata=$(find_snap "${root_snapshot_label}" "${blacklistdev}")
+		root_snapdata=$(find_snap "${root_snapshot_label}" "${blacklistdev}" "${whitelistdev}")
 		# This second type should be removed when snapshot will get smarter,
 		# hence when "/etc/live-snapshot*list" will be supported also by
 		# ext2|ext3|ext4|jffs2 snapshot types.
-		home_snapdata=$(find_snap "${home_snapshot_label}" "${blacklistdev}")
+		home_snapdata=$(find_snap "${home_snapshot_label}" "${blacklistdev}" "${whitelistdev}")
 
 		if [ -b "${cowprobe}" ]
 		then
@@ -1332,30 +1438,30 @@ setup_unionfs ()
 	if [ "${UNIONTYPE}" != "unionmount" ]
 	then
 
-	if [ "${cow_fstype}" = "nfs" ]
-	then
-		log_begin_msg \
-			"Trying nfsmount ${nfs_cow_opts} ${cowdevice} /cow"
-		nfsmount ${nfs_cow_opts} ${cowdevice} /cow || \
-			panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on /cow"
-	else
-		mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} /cow || \
-			panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on /cow"
-	fi
+		if [ "${cow_fstype}" = "nfs" ]
+		then
+			log_begin_msg \
+				"Trying nfsmount ${nfs_cow_opts} ${cowdevice} /cow"
+			nfsmount ${nfs_cow_opts} ${cowdevice} /cow || \
+				panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on /cow"
+		else
+			mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} /cow || \
+				panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on /cow"
+		fi
 	fi
 
 	rofscount=$(echo ${rofslist} |wc -w)
 
-	if [ -n "${EXPOSED_ROOT}" ]
+	if [ ${rofscount} -ne 1 ]
 	then
-		if [ ${rofscount} -ne 1 ]
-		then
-			panic "only one RO file system supported with exposedroot: ${rofslist}"
-		fi
-		exposedrootfs=${rofslist%% }
+		panic "only one RO file system supported with exposedroot: ${rofslist}"
+	fi
+	rofs=${rofslist%% }
 
-		mount --bind ${exposedrootfs} ${rootmnt} || \
-			panic "bind mount of ${exposedrootfs} failed"
+	if [ -n "${EXPOSED_ROOT}" ]
+	then
+		mount --bind ${rofs} ${rootmnt} || \
+			panic "bind mount of ${rofs} failed"
 
 		if [ -z "${SKIP_UNION_MOUNTS}" ]
 		then
@@ -1363,39 +1469,49 @@ setup_unionfs ()
 		else
 			cow_dirs=''
 		fi
+	else
+		cow_dirs="/"
+	fi
 
-		for dir in ${cow_dirs}; do
-			mkdir -p /cow${dir}
+	if [ "${cow_fstype}" != "tmpfs" ] && [ "${cow_dirs}" != "/" ] && [ "${UNIONTYPE}" = "unionmount" ]
+	then
+		true # FIXME: Maybe it does, I don't really know.
+		#panic "unionmount does not support subunions (${cow_dirs})."
+	fi
 
-			case "${UNIONTYPE}" in
-				unionfs-fuse)
-					(ulimit -n 16384; unionfs-fuse -o cow -o noinitgroups -o default_permissions -o allow_other -o use_ino -o suid /cow=RW:${exposedrootfs}${dir} "${rootmnt}${dir}" || panic "mount ${UNIONTYPE} on ${rootmnt}${dir} failed with option cow,noinitgroups,default_permissions,allow_other,use_ino,suid=/cow=RW:${exposedrootfs}${dir}")
-					mkdir -p /dev/.initramfs/varrun
-					pidof unionfs-fuse >> /dev/.initramfs/varrun/sendsigs.omit || true
-					;;
+	unionmountopts=""
+	unionmountpoint=""
 
-				*)
-					mount -t ${UNIONTYPE} -o rw,noatime,dirs=/cow${dir}=rw:${exposedrootfs}${dir}=ro ${UNIONTYPE} "${rootmnt}${dir}" || panic "mount ${UNIONTYPE} on ${rootmnt}${dir} failed with option rw,noatime,dirs=/cow${dir}=rw:${exposedrootfs}${dir}=ro"
-					;;
-			esac
-		done
-	else
+	for dir in ${cow_dirs}; do
+		mkdir -p /cow${dir}
+
+		unionmountpoint="${rootmnt}${dir}"
+		unionrw="/cow${dir}"
+		unionro="${rofs}${dir}"
+		# We don't handle spaces and other junk gracefully here, hopefully not needed.
 		case "${UNIONTYPE}" in
 			unionfs-fuse)
-				(ulimit -n 16384; unionfs-fuse -o cow -o noinitgroups -o default_permissions -o allow_other -o use_ino -o suid /cow=RW:${rofsstring} "${rootmnt}" || panic "mount ${UNIONTYPE} on ${rootmnt} failed with option cow,noinitgroups,default_permissions,allow_other,use_ino,suid=/cow:RW:${rofsstring}")
-				mkdir -p /dev/.initramfs/varrun
-				pidof unionfs-fuse >> /dev/.initramfs/varrun/sendsigs.omit || true
+				unionmountopts="-o cow -o noinitgroups -o default_permissions -o allow_other -o use_ino -o suid"
+				unionmountopts="${unionmountopts} ${unionrw}=RW:${unionro}=RO"
+				( sysctl -w fs.file-max=391524 ; ulimit -HSn 16384
+				unionfs-fuse ${unionmountopts} "${unionmountpoint}" ) && \
+				( mkdir -p /run/sendsigs.omit.d
+				pidof unionfs-fuse >> /run/sendsigs.omit.d/unionfs-fuse || true )
 				;;
 
 			unionmount)
-				mount_full -t ${cow_fstype} -o noatime,union,${cow_mountopt} ${cowdevice} "${rootmnt}" || panic "${UNIONTYPE} ${cowdevice} on ${rootmnt} failed with option noatime,union,${cow_mountopt}"
+				unionmountopts="-t ${cow_fstype} -o noatime,union,${cow_mountopt} ${cowdevice}"
+				mount_full $unionmountopts "${unionmountpoint}"
 				;;
 
+
 			*)
-				mount -t ${UNIONTYPE} -o noatime,${noxino_opt}dirs=/cow=rw:${rofsstring} ${UNIONTYPE} "${rootmnt}" || panic "mount ${UNIONTYPE} on ${rootmnt} failed with option noatime,${noxino_opt}dirs=/cow=rw:${rofsstring}"
+				unionmountopts="-o noatime,${noxino_opt}dirs=${unionrw}=rw:${unionro}=${roopt}"
+				mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}"
 				;;
-		esac
-	fi
+		esac || \
+			panic "mount ${UNIONTYPE} on ${unionmountpoint} failed with option ${unionmountopts}"
+	done
 
 	# Correct the permissions of /:
 	chmod 0755 "${rootmnt}"
@@ -1482,13 +1598,19 @@ check_dev ()
 
 		if [ "$ISO_DEVICE" = "/" ]
 		then
-			echo "Warning: device for bootoption isofrom= ($FROMISO) not found.">>/live.log
+			echo "Warning: device for bootoption isofrom= ($FROMISO) not found.">>/live-boot.log
 		else
-			mkdir /isofrom
-			mount -t auto "$ISO_DEVICE" /isofrom
-			ISO_NAME="$(echo $FROMISO | sed "s|$ISO_DEVICE||")"
-			loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
-			devname="${loopdevname}"
+			fs_type=$(get_fstype "${ISO_DEVICE}")
+			if is_supported_fs ${fs_type}
+			then
+				mkdir /isofrom
+				mount -t $fs_type "$ISO_DEVICE" /isofrom
+				ISO_NAME="$(echo $FROMISO | sed "s|$ISO_DEVICE||")"
+				loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
+				devname="${loopdevname}"
+			else
+				echo "Warning: unable to mount $ISO_DEVICE." >>/live-boot.log
+			fi
 		fi
 	fi
 
@@ -1509,6 +1631,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}" ]
@@ -1532,7 +1683,7 @@ check_dev ()
 			echo ${mountpoint}
 			return 0
 		else
-			umount ${mountpoint}
+			umount ${mountpoint} 2>/dev/null
 		fi
 	fi
 
@@ -1560,39 +1711,29 @@ find_livefs ()
 	# first look at the one specified in the command line
 	case "${LIVE_MEDIA}" in
 		removable-usb)
-			for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
+			for sysblock in $(removable_usb_dev "sys")
 			do
-				if [ "$(cat ${sysblock}/removable)" = "1" ]
-				then
-					if readlink ${sysblock} | grep -q usb ||
-					   readlink ${sysblock}/device | grep -q usb # linux < 2.6.29
+				for dev in $(subdevices "${sysblock}")
+				do
+					if check_dev "${dev}"
 					then
-						for dev in $(subdevices "${sysblock}")
-						do
-							if check_dev "${dev}"
-							then
-								return 0
-							fi
-						done
+						return 0
 					fi
-				fi
+				done
 			done
 			return 1
 			;;
 
 		removable)
-			for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
+			for sysblock in $(removable_dev "sys")
 			do
-				if [ "$(cat ${sysblock}/removable)" = "1" ]
-				then
-					for dev in $(subdevices "${sysblock}")
-					do
-						if check_dev "${dev}"
-						then
-							return 0
-						fi
-					done
-				fi
+				for dev in $(subdevices "${sysblock}")
+				do
+					if check_dev "${dev}"
+					then
+						return 0
+					fi
+				done
 			done
 			return 1
 			;;
@@ -1610,16 +1751,7 @@ find_livefs ()
 
 	# or do the scan of block devices
 	# prefer removable devices over non-removable devices, so scan them first
-	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | egrep -v "/(loop|ram|dm-|fd)")
-	do
-		if [ "$(cat ${sysblock}/removable)" = "1" ]
-		then
-			removable_devices_to_scan="$removable_devices_to_scan $sysblock"
-		else
-			nonremovable_devices_to_scan="$nonremovable_devices_to_scan $sysblock"
-		fi
-	done
-	devices_to_scan="$removable_devices_to_scan $nonremovable_devices_to_scan"
+	devices_to_scan="$(removable_dev 'sys') $(non_removable_dev 'sys')"
 
 	for sysblock in $devices_to_scan
 	do
@@ -1689,15 +1821,15 @@ integrity_check ()
 
 mountroot ()
 {
-        if [ -x /scripts/local-top/cryptroot ]; then
+	if [ -x /scripts/local-top/cryptroot ]; then
 	    /scripts/local-top/cryptroot
 	fi
 
 	exec 6>&1
 	exec 7>&2
-	exec > live.log
+	exec > live-boot.log
 	exec 2>&1
-	tail -f live.log >&7 &
+	tail -f live-boot.log >&7 &
 	tailpid="${!}"
 
 	# Ensure 'panic' function is overridden
@@ -1843,6 +1975,13 @@ mountroot ()
 		log_end_msg
 	fi
 
+	if [ -f /etc/resolv.conf ] && [ ! -s ${rootmnt}/etc/resolv.conf ]
+	then
+		log_begin_msg "Copying /etc/resolv.conf to ${rootmnt}/etc/resolv.conf"
+		cp -v /etc/resolv.conf ${rootmnt}/etc/resolv.conf
+		log_end_msg
+	fi
+
 	maybe_break live-bottom
 	log_begin_msg "Running /scripts/live-bottom\n"
 
@@ -1857,5 +1996,5 @@ mountroot ()
 	exec 1>&6 6>&-
 	exec 2>&7 7>&-
 	kill ${tailpid}
-	[ -w "${rootmnt}/var/log/" ] && cp live.log "${rootmnt}/var/log/" 2>/dev/null
+	[ -w "${rootmnt}/var/log/" ] && cp live-boot.log "${rootmnt}/var/log/" 2>/dev/null
 }