X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=components%2F9990-misc-helpers.sh;h=1267a6709080bf4e1bafa91246480e51490c1c78;hb=a70800ee4b64f8566344587935642d55feb51777;hp=65226821edeca01b2a6d7e1fc8bdbe9b30b37149;hpb=e6f399c69f13300dd83949266d4ab6161768faa5;p=live-boot-grml.git

diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh
index 6522682..1267a67 100755
--- a/components/9990-misc-helpers.sh
+++ b/components/9990-misc-helpers.sh
@@ -131,6 +131,7 @@ is_nice_device ()
 
 check_dev ()
 {
+	local force fix
 	sysdev="${1}"
 	devname="${2}"
 	skip_uuid_check="${3}"
@@ -138,7 +139,20 @@ check_dev ()
 	# support for fromiso=.../isofrom=....
 	if [ -n "$FROMISO" ]
 	then
-		ISO_DEVICE=$(dirname $FROMISO)
+		fs_type="${FROMISO%%:*}"
+		fs_type_auto='1'
+		ISO_DEVICE="${FROMISO}"
+		if echo "${fs_type}" | grep -q '[^[:alnum:]_-]'; then
+			# Not a valid file system name. Treat as part of the
+			# path, and, especially, use autodetection.
+			fs_type=''
+		else
+			# Looks like a file system specification, treat it
+			# like that.
+			fs_type_auto='0'
+			ISO_DEVICE="${ISO_DEVICE#*:}"
+		fi
+		ISO_DEVICE=$(dirname "${ISO_DEVICE}")
 		if ! [ -b $ISO_DEVICE ]
 		then
 			# to support unusual device names like /dev/cciss/c0d0p1
@@ -155,18 +169,52 @@ check_dev ()
 
 		if [ "$ISO_DEVICE" = "/" ]
 		then
-			echo "Warning: device for bootoption fromiso= ($FROMISO) not found.">>/boot.log
+			# not a block device, check if it's an iso file, for
+			# example an ISO when booting on an ONIE system
+			if echo "${FROMISO}" | grep -q "\.iso$"
+			then
+				if [ '0' -ne "${fs_type_auto}" ]; then
+					# Autodetect fs type if not overridden.
+					fs_type=$(get_fstype "${FROMISO}")
+				fi
+				if is_supported_fs ${fs_type}
+				then
+					mkdir /run/live/fromiso
+					mount -t "${fs_type}" -o 'ro' "${FROMISO}" '/run/live/fromiso'
+					if [ "$?" != 0 ]
+					then
+						echo "Warning: unable to mount ${FROMISO} (type ${fs_type})." >>/boot.log
+					fi
+					devname="/run/live/fromiso"
+				fi
+			else
+				echo "Warning: device for bootoption fromiso= ($FROMISO) not found.">>/boot.log
+			fi
 		else
-			fs_type=$(get_fstype "${ISO_DEVICE}")
+			# Need to extract actual ISO file path later on,
+			# initialize first.
+			iso_name="${FROMISO}"
+
+			if [ '0' -ne "${fs_type_auto}" ]; then
+				# Try to auto-detect file system if not
+				# explicitly provided.
+				fs_type=$(get_fstype "${ISO_DEVICE}")
+			else
+				# Delete file system type override.
+				iso_name="${iso_name#*:}"
+			fi
+			# At this point, the backing device should always be
+			# at the very front, so remove that - leaving only the
+			# ISO file path.
+			iso_name="$(echo "${iso_name}" | sed "s|^${ISO_DEVICE}||")"
 			if is_supported_fs ${fs_type}
 			then
-				mkdir /live/fromiso
-				mount -t $fs_type "$ISO_DEVICE" /live/fromiso
-				ISO_NAME="$(echo $FROMISO | sed "s|$ISO_DEVICE||")"
-				loopdevname=$(setup_loop "/live/fromiso/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
+				mkdir /run/live/fromiso
+				mount -t "${fs_type}" -o 'ro' "$ISO_DEVICE" '/run/live/fromiso'
+				loopdevname=$(setup_loop "/run/live/fromiso/${iso_name}" "loop" "/sys/block/loop*" "" '')
 				devname="${loopdevname}"
 			else
-				echo "Warning: unable to mount $ISO_DEVICE." >>/boot.log
+				echo "Warning: unable to mount $ISO_DEVICE (type ${fs_type})." >>/boot.log
 			fi
 		fi
 	fi
@@ -203,12 +251,13 @@ check_dev ()
 
 			/dev/md*)
 				# Adding raid support
-				if [ -x /scripts/local-top/mdadm ]
+				if [ -x /scripts/local-block/mdadm ]
 				then
-					[ -r /conf/conf.d/md ] && cp /conf/conf.d/md /conf/conf.d/md.orig
-					echo "MD_DEVS=$device " >> /conf/conf.d/md
-					/scripts/local-top/mdadm >>/boot.log
-					[ -r /conf/conf.d/md.orig ] && mv /conf/conf.d/md.orig /conf/conf.d/md
+					# Back in the day, when there was still a local-top mdadm script, we
+					# used to select specific devices to be auto-assembled.
+					# This functionality was dropped in the local-block script, so just
+					# scan and assemble all RAID devices.
+					/scripts/local-block/mdadm >>/boot.log
 				fi
 				;;
 		esac
@@ -231,6 +280,33 @@ check_dev ()
 	then
 		devuid=$(blkid -o value -s UUID "$devname")
 		[ -n "$devuid" ] && grep -qs "\<$devuid\>" /var/lib/live/boot/devices-already-tried-to-mount && continue
+
+		for _PARAMETER in ${LIVE_BOOT_CMDLINE}
+		do
+			case "${_PARAMETER}" in
+				forcefsck)
+					FORCEFSCK="true"
+					;;
+			esac
+		done
+
+		if [ "${PERSISTENCE_FSCK}" = "true" ] ||  [ "${PERSISTENCE_FSCK}" = "yes" ] || [ "${FORCEFSCK}" = "true" ]
+		then
+			force=""
+			if [ "$FORCEFSCK" = "true" ]
+			then
+				force="-f"
+			fi
+
+			fix="-a"
+			if [ "$FSCKFIX" = "true" ] || [ "$FSCKFIX" = "yes" ]
+			then
+				fix="-y"
+			fi
+
+			fsck $fix $force ${devname} >> fsck.log 2>&1
+		fi
+
 		mount -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue
 		[ -n "$devuid" ] && echo "$devuid" >> /var/lib/live/boot/devices-already-tried-to-mount
 
@@ -239,9 +315,9 @@ check_dev ()
 			if [ -f ${mountpoint}/${FINDISO} ]
 			then
 				umount ${mountpoint}
-				mkdir -p /live/findiso
-				mount -t ${fstype} -o ro,noatime "${devname}" /live/findiso
-				loopdevname=$(setup_loop "/live/findiso/${FINDISO}" "loop" "/sys/block/loop*" 0 "")
+				mkdir -p /run/live/findiso
+				mount -t ${fstype} -o ro,noatime "${devname}" /run/live/findiso
+				loopdevname=$(setup_loop "/run/live/findiso/${FINDISO}" "loop" "/sys/block/loop*" 0 "")
 				devname="${loopdevname}"
 				mount -t iso9660 -o ro,noatime "${devname}" ${mountpoint}
 			else
@@ -450,6 +526,14 @@ is_supported_fs ()
 	fi
 
 	# Try to look if it is already supported by the kernel
+	# For ntfs, since user space program ntfs-3g will be used. Check ntfs-3g instead of kernel module.
+	if [ "${fstype}" = "ntfs" ]; then
+		if type ntfs-3g >/dev/null 2>&1; then
+			return 0
+		else
+			return 1
+		fi
+	fi
 	if grep -q ${fstype} /proc/filesystems
 	then
 		return 0
@@ -708,7 +792,7 @@ try_mount ()
 			fstype=$(get_fstype "${dev}")
 		fi
 		mount -t "${fstype}" -o "${opts}" "${dev}" "${mountp}" || \
-		( echo "SKIPPING: Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}" > boot.log && return 0 )
+		( echo "SKIPPING: Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}" >> boot.log && return 0 )
 	fi
 }
 
@@ -726,7 +810,7 @@ mount_persistence_media ()
 
 	# get_custom_mounts() might call this with a directory path instead
 	# of a block device path. This means we have found sub-directory path
-	# underneath /lib/live/mounts/persistence, so we're done
+	# underneath /run/live/persistence, so we're done
 	if [ -d "${device}" ]
 	then
 		echo "${device}"
@@ -738,7 +822,7 @@ mount_persistence_media ()
 		return 1
 	fi
 
-	backing="/live/persistence/$(basename ${device})"
+	backing="/run/live/persistence/$(basename ${device})"
 
 	mkdir -p "${backing}"
 	old_backing="$(where_is_mounted ${device})"
@@ -750,7 +834,7 @@ mount_persistence_media ()
 		then
 			mount_opts="ro,noatime"
 		fi
-		if mount -t "${fstype}" -o "${mount_opts}" "${device}" "${backing}" >/dev/null
+		if mount -t "${fstype}" -o "${mount_opts}" "${device}" "${backing}" >/dev/null 2>&1
 		then
 			echo ${backing}
 			return 0
@@ -1049,7 +1133,7 @@ find_persistence_media ()
 	# in one union together.
 	#
 	black_listed_devices=""
-	for d in /live/rootfs/* /live/findiso /live/fromiso
+	for d in /run/live/rootfs/* /run/live/findiso /run/live/fromiso
 	do
 		black_listed_devices="${black_listed_devices} $(what_is_mounted_on d)"
 	done
@@ -1353,8 +1437,8 @@ do_union ()
 			# + a workdir to become mounted
 			# + workdir and upperdir to reside under the same mount
 			# + workdir and upperdir to be in separate directories
-			mkdir "${unionrw}/rw"
-			mkdir "${unionrw}/work"
+			mkdir -p "${unionrw}/rw"
+			mkdir -p "${unionrw}/work"
 			unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}/rw,workdir=${unionrw}/work"
 			;;
 	esac
@@ -1364,7 +1448,7 @@ do_union ()
 
 get_custom_mounts ()
 {
-	# Side-effect: leaves $devices with persistence.conf mounted in /live/persistence
+	# Side-effect: leaves $devices with persistence.conf mounted in /run/live/persistence
 	# Side-effect: prints info to file $custom_mounts
 
 	local custom_mounts devices bindings links
@@ -1395,7 +1479,7 @@ get_custom_mounts ()
 
 		if [ -n "${LIVE_BOOT_DEBUG}" ] && [ -e "${include_list}" ]
 		then
-			cp ${include_list} /live/persistence/${persistence_list}.${device_name}
+			cp ${include_list} /run/live/persistence/${persistence_list}.${device_name}
 		fi
 
 		while read dir options # < ${include_list}
@@ -1406,9 +1490,9 @@ get_custom_mounts ()
 				continue
 			fi
 
-			if trim_path ${dir} | grep -q -e "^[^/]" -e "^/lib" -e "^/lib/live\(/.*\)\?$" -e "^/\(.*/\)\?\.\.\?\(/.*\)\?$"
+			if trim_path ${dir} | grep -q -e "^[^/]" -e "^/lib" -e "^/run/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 \"/lib\", or \"/lib/live\" or any of its sub-directories."
+				log_warning_msg "Skipping unsafe custom mount ${dir}: must be an absolute path containing neither the \".\" nor \"..\" special dirs, and cannot be \"/lib\", or \"/run/live\" or any of its sub-directories."
 				continue
 			fi
 
@@ -1580,7 +1664,7 @@ activate_custom_mounts ()
 		rootfs_dest_backing=""
 		if [ -n "${opt_link}" ] || [ -n "${opt_union}" ]
 		then
-			for d in /live/rootfs/*
+			for d in /run/live/rootfs/*
 			do
 				if [ -n "${rootmnt}" ]
 				then
@@ -1598,11 +1682,11 @@ activate_custom_mounts ()
 		local cow_dir links_source
 		if [ -n "${opt_link}" ] && [ -z "${PERSISTENCE_READONLY}" ]
 		then
-			link_files ${source} ${dest} "s|^/live/|/lib/live/mount/|"
+			link_files ${source} ${dest} ""
 		elif [ -n "${opt_link}" ] && [ -n "${PERSISTENCE_READONLY}" ]
 		then
-			mkdir -p ${rootmnt}/lib/live/mount/persistence
-			links_source=$(mktemp -d ${rootmnt}/lib/live/mount/persistence/links-source-XXXXXX)
+			mkdir -p /run/live/persistence
+			links_source=$(mktemp -d /run/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
@@ -1610,7 +1694,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.
-			cow_dir="/live/overlay/lib/live/mount/persistence/$(basename ${links_source})"
+			cow_dir="/run/live/overlay/run/live/persistence/$(basename ${links_source})"
 			mkdir -p ${cow_dir}
 			chown_ref "${source}" "${cow_dir}"
 			chmod_ref "${source}" "${cow_dir}"
@@ -1627,7 +1711,7 @@ activate_custom_mounts ()
 			# bind-mount and union mount are handled the same
 			# in read-only mode, but note that rootfs_dest_backing
 			# is non-empty (and necessary) only for unions
-			cow_dir="/live/overlay/${dest}"
+			cow_dir="/run/live/overlay/${dest}"
 			if [ -e "${cow_dir}" ] && [ -z "${opt_link}" ]
 			then
 				# If an earlier custom mount has files here
@@ -1638,6 +1722,13 @@ activate_custom_mounts ()
 			mkdir -p ${cow_dir}
 			chown_ref "${source}" "${cow_dir}"
 			chmod_ref "${source}" "${cow_dir}"
+			if [ "${UNIONTYPE}" = "overlay" ]
+			then
+				# When we use overlay we add the "/rw" postfix to our source when using it
+				# as upper layer. Therefore we also have to add it here when using it as
+				# the lower layer.
+				source="${source}/rw"
+			fi
 			do_union ${dest} ${cow_dir} ${source} ${rootfs_dest_backing}
 		fi