X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=db6d25c9e0bc885701347247ef84b852521902f0;hb=8b3ccc55856039a150b0d06c4dce24c50020a8fd;hp=7c4e0d74cf43d18e9641d21d84c4992e90239185;hpb=5abe4bacca7eb71398e8f8285d777cbc7d15ba42;p=live-boot-grml.git

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 7c4e0d7..db6d25c 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -519,8 +519,9 @@ where_is_mounted ()
 }
 
 trim_path () {
-    # remove all unnecessary /:s in the path, including last
-    echo ${1} | sed 's|//|/|g' | sed 's|/$||'
+    # remove all unnecessary /:s in the path, including last one (except
+    # if path is just "/")
+    echo ${1} | sed 's|//\+|/|g' | sed 's|^\(.*[^/]\)/$|\1|'
 }
 
 what_is_mounted_on ()
@@ -1277,35 +1278,32 @@ get_custom_mounts ()
 			cp ${include_list} ${rootmnt}/live/persistent/${persistence_list}.${device_name}
 		fi
 
-		while read source dest options # < ${include_list}
+		while read dir options # < ${include_list}
 		do
-			if echo ${source} | grep -qe "^[[:space:]]*\(#.*\)\?$"
+			if echo ${dir} | grep -qe "^[[:space:]]*\(#.*\)\?$"
 			then
 				# skipping empty or commented lines
 				continue
 			fi
 
-			if [ -z "${dest}" ]
+			if trim_path ${dir} | grep -q -e "^[^/]" -e "^/$" -e "^/live\(/.*\)\?$" -e "^/\(.*/\)\?\.\.\?\(/.*\)\?$"
 			then
-				dest="${source}"
-			fi
-
-			if trim_path ${source} | grep -q -e "^[^/]" -e "^\(.*/\)\?\.\.\?\(/.*\)\?$"
-			then
-				log_warning_msg "Skipping unsafe custom mount with source ${source}: the source must be an absolute path w.r.t. the persistent media root and cannot contain \".\" or \"..\""
-				continue
-			fi
-
-			if trim_path ${dest} | grep -q -e "^[^/]" -e "^/$" -e "^/live\(/.*\)\?$" -e "^/\(.*/\)\?\.\.\?\(/.*\)\?$"
-			then
-				log_warning_msg "Skipping unsafe custom mount with desination ${dest}: the destination must be an absolute path containing neither \".\" nor \"..\", and cannot be /live (or any sub-directory therein) or / (for the latter, use ${root_overlay_label}-type persistence instead)"
+				log_warning_msg "Skipping unsafe custom mount ${dir}: must be an absolute path containing neither the \".\" nor \"..\" special dirs, and cannot be \"/live\" (or any sub-directory therein) or \"/\" (for the latter, use ${root_overlay_label}-type persistence)"
 				continue
 			fi
 
+			local opt_source=""
+			local opt_linkfiles=""
 			for opt in $(echo ${options} | tr ',' ' ');
 			do
 				case "${opt}" in
-					linkfiles|union)
+					source=*)
+						opt_source=${opt#source=}
+						;;
+					linkfiles)
+						opt_linkfiles="yes"
+						;;
+					union)
 						;;
 					*)
 						log_warning_msg "Skipping custom mount with unkown option: ${opt}"
@@ -1314,10 +1312,21 @@ get_custom_mounts ()
 				esac
 			done
 
-			# ensure that no multiple-/ occur in paths
+			local source="${dir}"
+			if [ -n "${opt_source}" ]
+			then
+				if echo ${opt_source} | grep -q -e "^/" -e "^\(.*/\)\?\.\.\?\(/.*\)\?$" && [ "${source}" != "." ]
+				then
+					log_warning_msg "Skipping unsafe custom mount with option source=${opt_source}: must be either \".\" (the media root) or a relative path w.r.t. the media root that contains neither comas, nor the special \".\" and \"..\" path components"
+					continue
+				else
+					source="${opt_source}"
+				fi
+			fi
+
 			local full_source="$(trim_path ${backing}/${source})"
-			local full_dest="$(trim_path ${rootmnt}/${dest})"
-			if echo ${options} | grep -qe "\<linkfiles\>";
+			local full_dest="$(trim_path ${rootmnt}/${dir})"
+			if [ -n "${opt_linkfiles}" ]
 			then
 				echo "${device} ${full_source} ${full_dest} ${options}" >> ${links}
 			else
@@ -1333,7 +1342,24 @@ get_custom_mounts ()
 
 	# After all mounts are considered we add symlinks so they
 	# won't be hidden by some mount.
-	[ -e "${links}" ] && sort -k3 -sbu ${links} >> ${custom_mounts} && rm ${links}
+	[ -e "${links}" ] && cat ${links} >> ${custom_mounts} && rm ${links}
+
+	# We need to make sure that no two custom mounts have the same sources
+	# or are nested; if that is the case, too much weird stuff can happen.
+	local prev_source="impossible source" # first iteration must not match
+	local prev_dest=""
+	# This sort will ensure that a source /a comes right before a source
+	# /a/b so we only need to look at the previous source
+	sort -k2 -b ${custom_mounts} |
+	while read device source dest options
+	do
+		if echo ${source} | grep -qe "^${prev_source}\(/.*\)\?$"
+		then
+			panic "Two persistent mounts have the same or nested sources: ${source} on ${dest}, and ${prev_source} on ${prev_dest}"
+		fi
+		prev_source=${source}
+		prev_dest=${dest}
+	done
 }
 
 activate_custom_mounts ()
@@ -1347,7 +1373,7 @@ activate_custom_mounts ()
 		local opt_union=""
 		for opt in $(echo ${options} | tr ',' ' ');
 		do
-			 case "${opt}" in
+			case "${opt}" in
 				linkfiles)
 					opt_linkfiles="yes"
 					;;
@@ -1364,7 +1390,7 @@ activate_custom_mounts ()
 
 		if [ -n "$(what_is_mounted_on "${dest}")" ]
 		then
-			log_warning_msg "Skipping custom mount ${source} on ${dest}: $(what_is_mounted_on "${dest}") is already mounted there"
+			log_warning_msg "Skipping custom mount ${dest}: $(what_is_mounted_on "${dest}") is already mounted there"
 			continue
 		fi
 
@@ -1420,6 +1446,8 @@ activate_custom_mounts ()
 			fi
 		fi
 
+		# XXX: If CONFIG_AUFS_ROBR is added to the Debian kernel we can
+		# ignore the loop below and set rofs_dest_backing=$dest
 		rofs_dest_backing=""
 		for d in ${rootmnt}/live/rofs/*
 		do
@@ -1504,6 +1532,6 @@ fix_home_rw_compatibility ()
 	if [ ! -r "${include_list}" ]
 	then
 		echo "# home-rw backwards compatibility:
-/ /home" > "${include_list}"
+/home source=." > "${include_list}"
 	fi
 }