X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=fad7107bb29339fb4cefd5dd1357706f083b59f1;hb=8dc6de07c581321bcf633b500cf54d83ee39cef1;hp=d9a8972e7d61f7dd5d4aff4263782102840f7436;hpb=916c9458ead4b3a2c227ff625483ac7470805ee6;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index d9a8972..fad7107 100755
--- a/scripts/live
+++ b/scripts/live
@@ -11,7 +11,8 @@ mountpoint="/live/image"
 alt_mountpoint="/media"
 LIVE_MEDIA_PATH="live"
 
-root_persistence="live-rw"
+root_overlay_label="full-ov"
+custom_overlay_label="custom-ov"
 root_snapshot_label="live-sn"
 home_snapshot_label="home-sn"
 persistence_list="live.persist"
@@ -273,8 +274,8 @@ Arguments ()
 				;;
 
 			persistent-subtext=*)
-				root_persistence="${root_persistence}-${ARGUMENT#persistent-subtext=}"
-				home_persistence="${home_persistence}-${ARGUMENT#persistent-subtext=}"
+				root_overlay_label="${root_overlay_label}-${ARGUMENT#persistent-subtext=}"
+				custom_overlay_label="${custom_overlay_label}-${ARGUMENT#persistent-subtext=}"
 				root_snapshot_label="${root_snapshot_label}-${ARGUMENT#persistent-subtext=}"
 				home_snapshot_label="${home_snapshot_label}-${ARGUMENT#persistent-subtext=}"
 				;;
@@ -1236,17 +1237,6 @@ setup_unionfs ()
 	# Let's just mount the read-only file systems first
 	rofslist=""
 
-	if [ "${UNIONTYPE}" = "aufs" ]
-	then
-		roopt="rr+wh"
-		noxino_opt="noxino,"
-	elif [ "${UNIONTYPE}" = "unionfs-fuse" ]
-	then
-		roopt="RO"
-	else
-		roopt="ro"
-	fi
-
 	if [ -z "${PLAIN_ROOT}" ]
 	then
 		# Read image names from ${MODULE}.module if it exists
@@ -1360,7 +1350,7 @@ setup_unionfs ()
 
 	mkdir -p /cow
 
-	# Looking for "${root_persistence}" device or file
+	# Looking for persistent devices or files
 	if [ -n "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ]
 	then
 
@@ -1405,7 +1395,7 @@ setup_unionfs ()
 
 		if echo ${PERSISTENT_METHOD} | grep -qe "\<overlay\>"
 		then
-			overlays="${root_persistence}"
+			overlays="${root_overlay_label} ${custom_overlay_label}"
 		fi
 
 		if echo ${PERSISTENT_METHOD} | grep -qe "\<snapshot\>"
@@ -1427,23 +1417,24 @@ setup_unionfs ()
 					# ext2|ext3|ext4|jffs2 snapshot types.
 					home_snapdata="${media#*=}"
 					;;
-				*)
+				${root_overlay_label}=*)
+					device="${media#*=}"
+					root_overlay_device="${device}"
+					;;
+				${custom_overlay_label}=*)
 					device="${media#*=}"
 					overlay_devices="${overlay_devices} ${device}"
 					;;
 			 esac
 		done
 
-		if [ -b "${cowprobe}" ] || [ -b "${homecow}" ]
+		if [ -b "${root_overlay_device}" ]
 		then
 			PERSISTENCE_IS_ON="1"
 			export PERSISTENCE_IS_ON
-		fi
 
-		if [ -b "${cowprobe}" ]
-		then
-			cowdevice=${cowprobe}
-			cow_fstype=$(get_fstype "${cowprobe}")
+			cowdevice=${root_overlay_device}
+			cow_fstype=$(get_fstype "${root_overlay_device}")
 			if [ -z "${PERSISTENT_READONLY}" ]
 			then
 				cow_mountopt="rw,noatime"
@@ -1494,26 +1485,28 @@ setup_unionfs ()
 	then
 		if [ -n "${PERSISTENT_READONLY}" ]
 		then
-			persistent_root="/$(basename ${cowdevice})-backing"
-			mkdir -p ${persistent_root}
+			mount -t tmpfs -o rw,noatime,mode=755 tmpfs "/cow"
+			root_backing="${rootmnt}/live/persistent/$(basename ${cowdevice})-root"
+			mkdir -p ${root_backing}
 		else
-			persistent_root="/cow"
+			root_backing="/cow"
 		fi
 
 		if [ "${cow_fstype}" = "nfs" ]
 		then
 			log_begin_msg \
-				"Trying nfsmount ${nfs_cow_opts} ${cowdevice} ${persistent_root}"
-			nfsmount ${nfs_cow_opts} ${cowdevice} ${persistent_root} || \
-				panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on ${persistent_root}"
+				"Trying nfsmount ${nfs_cow_opts} ${cowdevice} ${root_backing}"
+			nfsmount ${nfs_cow_opts} ${cowdevice} ${root_backing} || \
+				panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on ${root_backing}"
 		else
-			mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} ${persistent_root} || \
-				panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on ${persistent_root}"
+			mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} ${root_backing} || \
+				panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on ${root_backing}"
 		fi
 	fi
 
 	rofscount=$(echo ${rofslist} |wc -w)
 
+	# XXX: we now ensure that there can only be one read-only filesystem. Should this be inside the EXPOSED_ROOT if?
 	if [ ${rofscount} -ne 1 ]
 	then
 		panic "only one RO file system supported with exposedroot: ${rofslist}"
@@ -1541,48 +1534,26 @@ setup_unionfs ()
 		#panic "unionmount does not support subunions (${cow_dirs})."
 	fi
 
-	unionmountopts=""
-	unionmountpoint=""
-
 	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)
-				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)
-				unionmountopts="-t ${cow_fstype} -o noatime,union,${cow_mountopt} ${cowdevice}"
-				mount_full $unionmountopts "${unionmountpoint}"
-				;;
-
-			overlayfs)
-				unionmountopts="-o noatime,${noxino_opt},lowerdir=${unionro},upperdir=${unionrw}"
-				mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}"
-				;;
-
-			*)
-				if [ -n "${PERSISTENT_READONLY}" ]
-				then
-					mount -t tmpfs -o rw,noatime,mode=755 tmpfs "${unionrw}"
-					unionmountopts="-o noatime,${noxino_opt}dirs=${unionrw}=rw:${persistent_root}=${roopt}:${unionro}=${roopt}"
-				else
-					unionmountopts="-o noatime,${noxino_opt}dirs=${unionrw}=rw:${unionro}=${roopt}"
-				fi
-				mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}"
-				;;
-		esac || \
-			panic "mount ${UNIONTYPE} on ${unionmountpoint} failed with option ${unionmountopts}"
+		mkdir -p ${unionmountpoint}
+		if [ "${UNIONTYPE}" = "unionmount" ]
+		then
+			# FIXME: handle PERSISTENT_READONLY
+			unionmountopts="-t ${cow_fstype} -o noatime,union,${cow_mountopt} ${cowdevice}"
+			mount_full $unionmountopts "${unionmountpoint}"
+		else
+			cow_dir="/cow${dir}"
+			rofs_dir="${rofs}${dir}"
+			mkdir -p ${cow_dir}
+			if [ -n "${PERSISTENT_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ]
+			then
+				#mount -t tmpfs -o rw,noatime,mode=755 tmpfs "${cow_dir}"
+				do_union ${unionmountpoint} ${cow_dir} ${root_backing} ${rofs_dir}
+			else
+				do_union ${unionmountpoint} ${cow_dir} ${rofs_dir}
+			fi
+		fi || panic "mount ${UNIONTYPE} on ${unionmountpoint} failed with option ${unionmountopts}"
 	done
 
 	# Correct the permissions of /:
@@ -1593,18 +1564,52 @@ setup_unionfs ()
 	mkdir -p "${rootmnt}/live"
 	mount -t tmpfs tmpfs ${rootmnt}/live
 
+	live_rofs_list=""
+	# SHOWMOUNTS is necessary for custom mounts with the union option
+	if [ -n "${SHOWMOUNTS}" ] || ( [ -n "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ] )
+	then
+		# XXX: is the for loop really necessary? rofslist can only contain one item (see above XXX about EXPOSEDROOT) and this is also assumed elsewhere above (see use of $rofs above).
+		for d in ${rofslist}
+		do
+			live_rofs="${rootmnt}/live/${d##*/}"
+			live_rofs_list="${live_rofs_list} ${live_rofs}"
+			mkdir -p "${live_rofs}"
+			case d in
+				*.dir)
+					# do nothing # mount -o bind "${d}" "${live_rofs}"
+					;;
+				*)
+					case "${UNIONTYPE}" in
+						unionfs-fuse)
+							mount -o bind "${d}" "${live_rofs}"
+							;;
+						*)
+							mount -o move "${d}" "${live_rofs}"
+							;;
+					esac
+					;;
+			esac
+		done
+	fi
+
 	# Adding other custom mounts
 	if [ -n "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ]
 	then
-		bindings="/${persistence_list}"
-		touch ${bindings}
+		bindings="/bindings.list"
+		links="/links.list"
+		custom_mounts="/custom_mounts.list"
+		rm -f ${bindings} ${links} ${custom_mounts} >/dev/null 2>&1
+		persistent_backing="${rootmnt}/live/persistent"
+
+		# First we scan all media and gather all information about custom mounts
 		for device in ${overlay_devices}
 		do
 			if [ ! -b "${device}" ]
 			then
 				continue
 			fi
-			backing="/$(basename ${device})-backing"
+			device_name="$(basename ${device})"
+			backing="${persistent_backing}/${device_name}"
 			mkdir -p "${backing}"
 			device_fstype="$(get_fstype ${device})"
 			if [ -z "${PERSISTENT_READONLY}" ]
@@ -1623,19 +1628,24 @@ setup_unionfs ()
 				continue
 			fi
 
-			# FIXME: debug stuff, remove me?
-			[ "${DEBUG}" = "Yes" ] && cat ${include_list} >> ${rootmnt}/${bindings}-origs
-			while read source dest
+			[ "${DEBUG}" = "Yes" ] && cp ${include_list} ${persistent_backing}/${persistence_list}.${device_name}
+			while read source dest options # < ${include_list}
 			do
-				if echo ${source} | grep -qe "^[[:space:]]*#"
+				if echo ${source} | grep -qe "^[[:space:]]*\(#.*\)\?$"
 				then
-					# skipping commented line
+					# skipping empty or commented lines
 					continue
 				fi
-				if [ -z "${dest}" ]
+
+				if echo ${dest} | grep -qe "^[^/]"
+				then
+					options="${dest}"
+					dest="${source}"
+				elif [ -z "${dest}" ]
 				then
 					dest="${source}"
 				fi
+
 				if echo ${dest} | grep -qe "^/\+$\|^/\+live\(/.*\)\?$"
 				then
 					# mounting on / or /live could cause trouble
@@ -1643,14 +1653,31 @@ setup_unionfs ()
 					continue
 				fi
 
-				# FIXME: handle case: we already have /a/b in $bindings, but now we find /a -- /a should replace /a/b in $bindings.
-				# FIXME: handle case: we have /a in $bindings, now we find /a/b, so we skip /a/b
+				for opt in $(echo ${options} | tr ',' ' ');
+				do
+					case "${opt}" in
+						linkfiles|union)
+							;;
+						*)
+							log_warning_msg "Skipping custom mount with unkown option: ${opt}"
+							continue 2
+							;;
+					esac
+				done
+
+				# FIXME: handle case: we already have /a/b in $bindings added from current $device, but now we find /a -- /a should replace /a/b in $bindings.
+				# FIXME: handle case: we have /a in $bindings from current $device, now we find /a/b, so we skip /a/b
 
 				# ensure that no multiple-/ occur in paths
 				full_source="$(echo ${backing}/${source}/ | sed -e 's|/\+|/|g')"
 				full_dest="$(echo ${rootmnt}/${dest}/ | sed -e 's|/\+|/|g')"
 				device_used="yes"
-				echo "${full_source} ${full_dest}" >> ${bindings}
+				if echo ${options} | grep -qe "\<linkfiles\>";
+				then
+					echo "${full_source} ${full_dest} ${options}" >> ${links}
+				else
+					echo "${full_source} ${full_dest} ${options}" >> ${bindings}
+				fi
 			done < ${include_list}
 
 			if [ -z "${device_used}" ]
@@ -1661,14 +1688,36 @@ setup_unionfs ()
 			fi
 		done
 
-		# we sort the list according to destination so we're sure that we won't hide a previous mount. we also ignore duplicate destinations in a more or less arbitrary way
-		sort -k2 -sbu ${bindings} -o ${bindings}
+		# We sort the list according to destination so we're sure 
+		# that we won't hide a previous mount. We also  ignore
+		# duplicate destinations in a more or less arbitrary way.
+		[ -e "${bindings}" ] && sort -k2 -sbu ${bindings} >> ${custom_mounts}
+		rm -f ${bindings}
+
+		# After all mounts are considered we add symlinks so they
+		# won't be hidden by some mount.
+		[ -e "${links}" ] && sort -k2 -sbu ${links} >> ${custom_mounts}
+		rm -f ${links}
 
-		# FIXME: debug stuff, remove me?
-		[ "${DEBUG}" = "Yes" ] && cp ${bindings} ${rootmnt}/${bindings}-results
+		[ "${DEBUG}" = "Yes" ] && cp ${custom_mounts} ${persistent_backing}
 
-		while read source dest
+		# Now we do the actual mounting (and symlinking)
+		while read source dest options	# < ${custom_mounts}
 		do
+			local opt_linkfiles=""
+			local opt_union=""
+			for opt in $(echo ${options} | tr ',' ' ');
+			do
+				 case "${opt}" in
+					linkfiles)
+						opt_linkfiles="yes"
+						;;
+					union)
+						opt_union="yes"
+						;;
+				esac
+			done
+
 			if mountpoint -q "${dest}";
 			then
 				log_warning_msg "Skipping custom mount ${source} on ${dest}: destination is already a mount point"
@@ -1699,34 +1748,71 @@ setup_unionfs ()
 				fi
 			fi
 
-			# FIXME: could we instead only save the aufs-diff in the persistent media? implications? What about when there's changes in the live image?
-
 			# if ${source} doesn't exist on our persistent media we
 			# bootstrap it with $dest from the live filesystem.
 			# this both makes sense and is critical if we're
 			# dealing with /etc or other system dir.
 			if [ ! -d "${source}" ]
 			then
-				if [ -n "${PERSISTENT_READONLY}" ]
+				if [ -n "${PERSISTENT_READONLY}" ] || [ -n "${opt_linkfiles}" ]
 				then
 					continue
+				elif [ -n "${opt_union}" ]
+				then
+					# union's don't need to be bootstrapped
+					mkdir "${source}"
+				else
+					# ensure that $dest is not copied *into* $source
+					mkdir -p "$(dirname ${source})"
+					cp -a "${dest}" "${source}"
 				fi
-				# ensure that $dest is not copied *into* $source
-				mkdir -p "$(dirname ${source})"
-				cp -a "${dest}" "${source}"
 			fi
 
+			rofs_dest_backing=""
+			for d in ${live_rofs_list}
+			do
+				rofs_dest_backing="${d}/$(echo ${dest} | sed -e "s|${rootmnt}||")"
+				if [ -d "${rofs_dest_backing}" ]
+				then
+					break
+				else
+					rofs_dest_backing=""
+				fi
+			done
+
 			if [ -z "${PERSISTENT_READONLY}" ]
 			then
-				mount --bind "${source}" "${dest}"
+				if [ -n "${opt_linkfiles}" ]
+				then
+					links_source="${source}"
+					links_dest="${dest}"
+				elif [ -n "${opt_union}" ]
+				then
+					do_union ${dest} ${source} ${rofs_dest_backing}
+				else
+					mount --bind "${source}" "${dest}"
+				fi
 			else
-				unionrw="$(echo ${dest} | sed -e "s|${rootmnt}|/cow/|")"
-				mkdir -p ${unionrw}
-				unionmountopts="noatime,${noxino_opt}dirs=${unionrw}=rw:${source}=${roopt}"
-				mount -t "${UNIONTYPE}" -o "${unionmountopts}" "${UNIONTYPE}" "${dest}"
+				if [ -n "${opt_linkfiles}" ]
+				then
+					links_dest="${dest}"
+					dest="$(mktemp -d ${persistent_backing}/links_source-XXXXXX)"
+					links_source="${dest}"
+				fi
+				cow_dir="$(echo ${dest} | sed -e "s|${rootmnt}|/cow/|")"
+				mkdir -p ${cow_dir}
+				do_union ${dest} ${cow_dir} ${source} ${rofs_dest_backing}
 			fi
-		done < ${bindings}
-		rm -f ${bindings}
+
+			if [ -n "${opt_linkfiles}" ]
+			then
+				link_files "${links_source}" "${links_dest}" "${rootmnt}"
+			fi
+
+			PERSISTENCE_IS_ON="1"
+			export PERSISTENCE_IS_ON
+		done < ${custom_mounts}
+		rm -f ${custom_mounts}
 
 		# Look for other snapshots to copy in
 		try_snap "${root_snapdata}" "${rootmnt}" "ROOT"
@@ -1734,32 +1820,6 @@ setup_unionfs ()
 		try_snap "${home_snapdata}" "${rootmnt}" "HOME" "/home"
 	fi
 
-	if [ -n "${SHOWMOUNTS}" ]
-	then
-		for d in ${rofslist}
-		do
-			mkdir -p "${rootmnt}/live/${d##*/}"
-
-			case d in
-				*.dir)
-					# do nothing # mount -o bind "${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
-	fi
-
 	# shows cow fs on /cow for use by live-snapshot
 	mkdir -p "${rootmnt}/live/cow"
 	mount -o move /cow "${rootmnt}/live/cow" >/dev/null 2>&1 || mount -o bind /cow "${rootmnt}/live/cow" || log_warning_msg "Unable to move or bind /cow to ${rootmnt}/live/cow"