X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=b90637a625d0a98a871bd3e1c42ffab51ddd5244;hb=285412f944154e428f9da10f0e270aa85afe9276;hp=40058e92cad5dbfdd04059e4ec14408a3da35574;hpb=4e54d60d7f69ae3441e519e5611bd7ea48a8be19;p=live-boot-grml.git

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 40058e9..b90637a 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -15,14 +15,13 @@ else
 	udevinfo='udevinfo'
 fi
 
-root_overlay_label="full-ov"
 old_root_overlay_label="live-rw"
 old_home_overlay_label="home-rw"
 custom_overlay_label="custom-ov"
 root_snapshot_label="live-sn"
 old_root_snapshot_label="live-sn"
 home_snapshot_label="home-sn"
-persistence_list="live.persist"
+persistence_list="live-persistence.conf"
 
 Arguments ()
 {
@@ -89,6 +88,11 @@ Arguments ()
 				export FETCH
 				;;
 
+			findiso=*)
+				FINDISO="${ARGUMENT#findiso=}"
+				export FINDISO
+				;;
+
 			forcepersistencefsck)
 				FORCEPERSISTENCEFSCK="Yes"
 				export FORCEPERSISTENCEFSCK
@@ -256,7 +260,6 @@ Arguments ()
 				;;
 
 			persistence-subtext=*)
-				root_overlay_label="${root_overlay_label}-${ARGUMENT#persistence-subtext=}"
 				old_root_overlay_label="${old_root_overlay_label}-${ARGUMENT#persistence-subtext=}"
 				old_home_overlay_label="${old_home_overlay_label}-${ARGUMENT#persistence-subtext=}"
 				custom_overlay_label="${custom_overlay_label}-${ARGUMENT#persistence-subtext=}"
@@ -740,16 +743,9 @@ try_mount ()
 mount_persistence_media ()
 {
 	local device=${1}
-	local backing=""
+	local probe=${2}
 
-	# We can't mount into ${rootmnt}/live before ${rootmnt} has been
-	# mounted since that would cover our mountpoint.
-	if [ -n "${rootmnt}" ] && [ -z "$(what_is_mounted_on ${rootmnt})" ]
-	then
-		backing="/$(basename ${device})-backing"
-	else
-		backing="${rootmnt}/live/persistence/$(basename ${device})"
-	fi
+	local backing="/live/persistence/$(basename ${device})"
 
 	mkdir -p "${backing}"
 	local old_backing="$(where_is_mounted ${device})"
@@ -766,7 +762,8 @@ mount_persistence_media ()
 			echo ${backing}
 			return 0
 		else
-			log_warning_msg "Failed to mount persistence media ${device}"
+			[ -z "${probe}" ] && log_warning_msg "Failed to mount persistence media ${device}"
+			rmdir "${backing}"
 			return 1
 		fi
 	elif [ "${backing}" != "${old_backing}" ]
@@ -776,7 +773,8 @@ mount_persistence_media ()
 			echo ${backing}
 			return 0
 		else
-			log_warning_msg "Failed to move persistence media ${device}"
+			[ -z "${probe}" ] && log_warning_msg "Failed to move persistence media ${device}"
+			rmdir "${backing}"
 			return 1
 		fi
 	fi
@@ -912,7 +910,7 @@ probe_for_file_name ()
 	local dev="${3}"
 
 	local ret=""
-	local backing="$(mount_persistence_media ${dev})"
+	local backing="$(mount_persistence_media ${dev} probe)"
 	if [ -z "${backing}" ]
 	then
 	    return
@@ -975,7 +973,9 @@ find_persistence_media ()
 	local white_listed_devices="${3}"
 	local ret=""
 
-	for dev in $(storage_devices "" "${white_listed_devices}")
+	local black_listed_devices="$(what_is_mounted_on /live/image)"
+
+	for dev in $(storage_devices "${black_listed_devices}" "${white_listed_devices}")
 	do
 		local result=""
 
@@ -1261,7 +1261,7 @@ do_union ()
 
 get_custom_mounts ()
 {
-	# Side-effect: leaves $devices with live.persist mounted in ${rootmnt}/live/persistence
+	# Side-effect: leaves $devices with live-persistence.conf mounted in /live/persistence
 	# Side-effect: prints info to file $custom_mounts
 
 	local custom_mounts=${1}
@@ -1294,7 +1294,7 @@ get_custom_mounts ()
 
 		if [ -n "${DEBUG}" ] && [ -e "${include_list}" ]
 		then
-			cp ${include_list} ${rootmnt}/live/persistence/${persistence_list}.${device_name}
+			cp ${include_list} /live/persistence/${persistence_list}.${device_name}
 		fi
 
 		while read dir options # < ${include_list}
@@ -1305,22 +1305,22 @@ get_custom_mounts ()
 				continue
 			fi
 
-			if trim_path ${dir} | grep -q -e "^[^/]" -e "^/$" -e "^/live\(/.*\)\?$" -e "^/\(.*/\)\?\.\.\?\(/.*\)\?$"
+			if trim_path ${dir} | grep -q -e "^[^/]" -e "^/live\(/.*\)\?$" -e "^/\(.*/\)\?\.\.\?\(/.*\)\?$"
 			then
-				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)"
+				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."
 				continue
 			fi
 
 			local opt_source=""
-			local opt_linkfiles=""
+			local opt_link=""
 			for opt in $(echo ${options} | tr ',' ' ');
 			do
 				case "${opt}" in
 					source=*)
 						opt_source=${opt#source=}
 						;;
-					linkfiles)
-						opt_linkfiles="yes"
+					link)
+						opt_link="yes"
 						;;
 					union|bind)
 						;;
@@ -1345,7 +1345,7 @@ get_custom_mounts ()
 
 			local full_source="$(trim_path ${backing}/${source})"
 			local full_dest="$(trim_path ${rootmnt}/${dir})"
-			if [ -n "${opt_linkfiles}" ]
+			if [ -n "${opt_link}" ]
 			then
 				echo "${device} ${full_source} ${full_dest} ${options}" >> ${links}
 			else
@@ -1389,30 +1389,35 @@ activate_custom_mounts ()
 	while read device source dest options # < ${custom_mounts}
 	do
 		local opt_bind="yes"
-		local opt_linkfiles=""
+		local opt_link=""
 		local opt_union=""
 		for opt in $(echo ${options} | tr ',' ' ');
 		do
 			case "${opt}" in
 				bind)
 					opt_bind="yes"
-					unset opt_linkfiles opt_union
+					unset opt_link opt_union
 					;;
-				linkfiles)
-					opt_linkfiles="yes"
+				link)
+					opt_link="yes"
 					unset opt_bind opt_union
 					;;
 				union)
 					opt_union="yes"
-					unset opt_bind opt_linkfiles
+					unset opt_bind opt_link
 					;;
 			esac
 		done
 
 		if [ -n "$(what_is_mounted_on "${dest}")" ]
 		then
-			log_warning_msg "Skipping custom mount ${dest}: $(what_is_mounted_on "${dest}") is already mounted there"
-			continue
+			if [ "${dest}" = "${rootmnt}" ]
+			then
+				umount "${dest}"
+			else
+				log_warning_msg "Skipping custom mount ${dest}: $(what_is_mounted_on "${dest}") is already mounted there"
+				continue
+			fi
 		fi
 
 		if [ ! -d "${dest}" ]
@@ -1449,10 +1454,10 @@ activate_custom_mounts ()
 			if [ -n "${PERSISTENCE_READONLY}" ]
 			then
 				continue
-			elif [ -n "${opt_union}" ] || [ -n "${opt_linkfiles}" ]
+			elif [ -n "${opt_union}" ] || [ -n "${opt_link}" ]
 			then
 				# unions and don't need to be bootstrapped
-				# linkfiles dirs can't be bootstrapped in a sensible way
+				# link dirs can't be bootstrapped in a sensible way
 				mkdir -p "${source}"
 				chown_ref "${dest}" "${source}"
 				chmod_ref "${dest}" "${source}"
@@ -1467,9 +1472,9 @@ activate_custom_mounts ()
 		# XXX: If CONFIG_AUFS_ROBR is added to the Debian kernel we can
 		# ignore the loop below and set rofs_dest_backing=$dest
 		local rofs_dest_backing=""
-		if [ -n "${opt_linkfiles}"]
+		if [ -n "${opt_link}"]
 		then
-			for d in ${rootmnt}/live/rofs/*
+			for d in /live/rofs/*
 			do
 				if [ -n "${rootmnt}" ]
 				then
@@ -1486,13 +1491,13 @@ activate_custom_mounts ()
 			done
 		fi
 
-		if [ -n "${opt_linkfiles}" ] && [ -z "${PERSISTENCE_READONLY}" ]
+		if [ -n "${opt_link}" ] && [ -z "${PERSISTENCE_READONLY}" ]
 		then
 			link_files ${source} ${dest} ${rootmnt}
-		elif [ -n "${opt_linkfiles}" ] && [ -n "${PERSISTENCE_READONLY}" ]
+		elif [ -n "${opt_link}" ] && [ -n "${PERSISTENCE_READONLY}" ]
 		then
-			mkdir -p ${rootmnt}/live/persistence
-			local links_source=$(mktemp -d ${rootmnt}/live/persistence/links-source-XXXXXX)
+			mkdir -p /live/persistence
+			local links_source=$(mktemp -d /live/persistence/links-source-XXXXXX)
 			chown_ref ${source} ${links_source}
 			chmod_ref ${source} ${links_source}
 			# We put the cow dir in the below strange place to
@@ -1500,14 +1505,7 @@ activate_custom_mounts ()
 			# has its own directory and isn't nested with some
 			# other custom mount (if so that mount's files would
 			# be linked, causing breakage.
-			if [ -n "${rootmnt}" ]
-			then
-				local cow_dir="/overlay/live/persistence/$(basename ${links_source})"
-			else
-				# This is happens if persistence is activated
-				# post boot
-				local cow_dir="/live/overlay/live/persistence/$(basename ${links_source})"
-			fi
+			local cow_dir="/live/overlay/live/persistence/$(basename ${links_source})"
 			mkdir -p ${cow_dir}
 			chown_ref "${source}" "${cow_dir}"
 			chmod_ref "${source}" "${cow_dir}"
@@ -1526,13 +1524,13 @@ activate_custom_mounts ()
 			# is non-empty (and necessary) only for unions
 			if [ -n "${rootmnt}" ]
 			then
-				local cow_dir="$(echo ${dest} | sed -e "s|^${rootmnt}|/overlay/|")"
+				local cow_dir="$(echo ${dest} | sed -e "s|^${rootmnt}|/live/overlay/|")"
 			else
 				# This is happens if persistence is activated
 				# post boot
 				local cow_dir="/live/overlay/${dest}"
 			fi
-			if [ -e "${cow_dir}" ] && [ -z "${opt_linkfiles}" ]
+			if [ -e "${cow_dir}" ] && [ -z "${opt_link}" ]
 			then
 				# If an earlier custom mount has files here
 				# it will "block" the current mount's files
@@ -1557,9 +1555,11 @@ activate_custom_mounts ()
 	echo ${used_devices}
 }
 
-fix_home_rw_compatibility ()
+fix_backwards_compatibility ()
 {
 	local device=${1}
+	local dir=${2}
+	local opt=${3}
 
 	if [ -n "${PERSISTENCE_READONLY}" ]
 	then
@@ -1575,7 +1575,14 @@ fix_home_rw_compatibility ()
 	local include_list="${backing}/${persistence_list}"
 	if [ ! -r "${include_list}" ]
 	then
-		echo "# home-rw backwards compatibility:
-/home source=." > "${include_list}"
+		echo "# persistence backwards compatibility:
+${dir} ${opt},source=." > "${include_list}"
 	fi
 }
+
+is_mountpoint ()
+{
+	directory="$1"
+
+	[ $(stat -fc%d:%D "${directory}") != $(stat -fc%d:%D "${directory}/..") ]
+}