X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=3e7ed03115bfd40e3f7733be9ba0fd7d75e29631;hb=612de86fa7f8d721690c1b70e216cbc678d280a7;hp=a8dc6c8b1a26117cd65f044532aca899bba18ca3;hpb=cede9a21cf3093b441026095eaec3d67f8a3dc7f;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index a8dc6c8..3e7ed03 100755
--- a/scripts/live
+++ b/scripts/live
@@ -401,6 +401,11 @@ Arguments ()
 				export NOPERSISTENT
 				;;
 
+			quickusbmodules)
+				QUICKUSBMODULES="Yes"
+				export QUICKUSBMODULES
+				;;
+
 			preseed/file=*|file=*)
 				LOCATION="${ARGUMENT#*=}"
 				export LOCATION
@@ -757,16 +762,8 @@ do_netmount ()
 
 	modprobe -q af_packet # For DHCP
 
-	if [ -x /sbin/udevadm ]
-	then
-		# lenny
-		udevadm trigger
-		udevadm settle
-	else
-		# etch
-		udevtrigger
-		udevsettle
-	fi
+	udevadm trigger
+	udevadm settle
 
 	ipconfig ${DEVICE} | tee /netboot.config
 
@@ -991,7 +988,7 @@ find_snap ()
 	if [ "${PERSISTENT}" != "nofiles" ]
 	then
 		# search for image files
-		snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2 ${snap_label}.ext3 ${snap_label}.ext4 ${snap_label}.jffs2")
+		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")
 	fi
 
 	if [ -z "${snapdata}" ]
@@ -1089,7 +1086,17 @@ setup_unionfs ()
 	image_directory="${1}"
 	rootmnt="${2}"
         addimage_directory="${3}"
-	modprobe -q -b ${UNIONTYPE}
+
+	case ${UNIONTYPE} in
+		aufs|unionfs)
+			modprobe -q -b ${UNIONTYPE}
+
+			if ! cut -f2 /proc/filesystems | grep -q "^${UNIONTYPE}\$" && [ -x /bin/unionfs-fuse ]
+			then
+				UNIONTYPE="unionfs-fuse"
+			fi
+			;;
+	esac
 
 	# run-init can't deal with images in a subdir, but we're going to
 	# move all of these away before it runs anyway.  No, we're not,
@@ -1104,7 +1111,10 @@ setup_unionfs ()
 
 	if [ "${UNIONTYPE}" = "aufs" ]
 	then
-		roopt="rr,xino=/tmp/aufs.xino"
+		roopt="rr,noxino"
+	elif [ "${UNIONTYPE}" = "unionfs-fuse" ]
+	then
+		roopt="RO"
 	else
 		roopt="ro"
 	fi
@@ -1218,37 +1228,32 @@ setup_unionfs ()
 	# Looking for "${root_persistence}" device or file
 	if [ -n "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ]
 	then
-		# Load USB modules
-		num_block=$(ls -l /sys/block | wc -l)
-		for module in sd_mod uhci-hcd ehci-hcd ohci-hcd usb-storage
-		do
-			modprobe -q -b ${module}
-		done
-
-		if [ -x /sbin/udevadm ]
+		if [ -z "${QUICKUSBMODULES}" ]
 		then
-			# lenny
+			# Load USB modules
+			num_block=$(ls -l /sys/block | wc -l)
+			for module in sd_mod uhci-hcd ehci-hcd ohci-hcd usb-storage
+			do
+				modprobe -q -b ${module}
+			done
+
 			udevadm trigger
 			udevadm settle
-		else
-			# etch
-			udevtrigger
-			udevsettle
-		fi
 
-		# For some reason, udevsettle does not block in this scenario,
-		# so we sleep for a little while.
-		#
-		# See https://bugs.launchpad.net/ubuntu/+source/casper/+bug/84591
-		for timeout in 5 4 3 2 1
-		do
-			sleep 1
+			# For some reason, udevsettle does not block in this scenario,
+			# so we sleep for a little while.
+			#
+			# See https://bugs.launchpad.net/ubuntu/+source/casper/+bug/84591
+			for timeout in 5 4 3 2 1
+			do
+				sleep 1
 
-			if [ $(ls -l /sys/block | wc -l) -gt ${num_block} ]
-			then
-				break
-			fi
-		done
+				if [ $(ls -l /sys/block | wc -l) -gt ${num_block} ]
+				then
+					break
+				fi
+			done
+		fi
 
 		# search for label and files (this could be hugely optimized)
 		cowprobe=$(find_cow_device "${root_persistence}")
@@ -1349,16 +1354,27 @@ setup_unionfs ()
 
 		for dir in ${cow_dirs}; do
 			mkdir -p /cow${dir}
-			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"
+
+			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}")
+					;;
+
+				*)
+					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
-		mount -t ${UNIONTYPE} -o noatime,dirs=/cow=rw:${rofsstring} \
-			${UNIONTYPE} "${rootmnt}" || panic "mount ${UNIONTYPE} on \
-			${rootmnt} failed with option noatime,dirs=/cow=rw:${rofsstring}"
+		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}")
+				;;
+
+			*)
+				mount -t ${UNIONTYPE} -o noatime,dirs=/cow=rw:${rofsstring} ${UNIONTYPE} "${rootmnt}" || panic "mount ${UNIONTYPE} on ${rootmnt} failed with option noatime,dirs=/cow=rw:${rofsstring}"
+				;;
+		esac
 	fi
 
 	# Correct the permissions of /:
@@ -1401,7 +1417,15 @@ setup_unionfs ()
 					;;
 
 				*)
-					mount -o move "${d}" "${rootmnt}/live/${d##*/}"
+					case "${UNIONTYPE}" in
+						unionfs-fuse)
+							mount -o bind "${d}" "${rootmnt}/live/${d##*/}"
+							;;
+
+						*)
+							mount -o move "${d}" "${rootmnt}/live/${d##*/}"
+							;;
+					esac
 					;;
 			esac
 		done
@@ -1722,12 +1746,24 @@ mountroot ()
 
 	log_end_msg
 
+	# unionfs-fuse needs /dev to be bind-mounted for the duration of
+	# live-bottom; udev's init script will take care of things after that
+	if [ "${UNIONTYPE}" = unionfs-fuse ]
+	then
+		mount -n -o bind /dev "${rootmnt}/dev"
+	fi
+
 	maybe_break live-bottom
 	log_begin_msg "Running /scripts/live-bottom\n"
 
 	run_scripts /scripts/live-bottom
 	log_end_msg
 
+	if [ "${UNIONFS}" = unionfs-fuse ]
+	then
+		umount "${rootmnt}/dev"
+	fi
+
 	exec 1>&6 6>&-
 	exec 2>&7 7>&-
 	kill ${tailpid}