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

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 75fc106..db6d25c 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -1317,7 +1317,7 @@ get_custom_mounts ()
 			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) a relative path w.r.t. the media root that doesn't contain comas or the special dirs \".\" and \"..\""
+					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}"
@@ -1342,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 ()
@@ -1356,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"
 					;;