X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=f99fa5674d3da0505f6f3b2be1b514014e21db57;hb=bd2cfbec5fe67ea696162c1caa5c80187a070bee;hp=5e1730bf652ea7a93ee2e594a5dc99ed2a38abc0;hpb=0d795cb825dd17de286f9740e30a3790b7916d2f;p=live-boot-grml.git

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 5e1730b..f99fa56 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -29,11 +29,32 @@ subdevices ()
 	echo ${r}
 }
 
+is_supported_fs ()
+{
+	# FIXME: do something better like the scan of supported filesystems
+	fstype="${1}"
+
+	case ${fstype} in
+		vfat|iso9660|udf|ext2|ext3|ntfs|jffs2)
+		return 0
+		;;
+	esac
+
+	return 1
+}
+
 get_fstype ()
 {
 	local FSTYPE
 	local FSSIZE
 
+	# fstype misreports LUKS devices
+	if is_luks "${1}"
+	then
+	    /lib/udev/vol_id -t ${1} 2>/dev/null
+	    return
+	fi
+
 	eval $(fstype < ${1})
 
 	if [ "${FSTYPE}" != "unknown" ]
@@ -51,12 +72,9 @@ where_is_mounted ()
 
 	if grep -q "^${device} " /proc/mounts
 	then
-		grep "^${device} " /proc/mounts | read d mountpoint rest
-		echo ${mountpoint}
-		return 0
+		# return the first found
+		grep "^${device} " /proc/mounts | cut -f2 -d ' '
 	fi
-
-	return 1
 }
 
 lastline ()
@@ -99,9 +117,9 @@ fs_size ()
 
 	if [ -z "${mountp}" ]
 	then
-		mountp=$(where_is_mounted "${dev}")
+		mountp="$(where_is_mounted ${dev})"
 
-		if [ "${?}" -gt 0 ]
+		if [ -z "${mountp}" ]
 		then
 			mountp="/mnt/tmp_fs_size"
 
@@ -146,6 +164,7 @@ setup_loop ()
 	local pattern=${3}
 	local offset=${4}
 	local encryption=${5}
+	local readonly=${6}
 
 	modprobe -q -b "${module}"
 	udevsettle
@@ -157,6 +176,14 @@ setup_loop ()
 			dev=$(sys2dev "${loopdev}")
 			options=''
 
+			if [ -n ${readonly} ]
+			then
+				if losetup --help 2>&1 | grep -q -- "-r\b"
+				then
+					options="${options} -r"
+				fi
+			fi
+
 			if [ 0 -lt "${offset}" ]
 			then
 				options="${options} -o ${offset}"
@@ -171,9 +198,10 @@ setup_loop ()
 				do
 					load_keymap
 
-					echo -n "Enter passphrase for ${fspath}: " >&6
+					echo -n "Enter passphrase for root filesystem: " >&6
 					read -s passphrase
 					echo "${passphrase}" > /tmp/passphrase
+					unset passphrase
 					exec 9</tmp/passphrase
 					/sbin/losetup ${options} -e "${encryption}" -p 9 "${dev}" "${fspath}"
 					error=${?}
@@ -186,10 +214,11 @@ setup_loop ()
 						break
 					fi
 
-					echo -n "Something went wrong... Retry? [YES/no] " >&6
+					echo
+					echo -n "There was an error decrypting the root filesystem ... Retry? [Y/n] " >&6
 					read answer
 
-					if [ 'no' = "${answer}" ]
+					if [ "$(echo "${answer}" | cut -b1 | tr A-Z a-z)" = "n" ]
 					then
 						unset answer
 						break
@@ -211,10 +240,12 @@ try_mount ()
 	mountp="${2}"
 	opts="${3}"
 
-	if where_is_mounted ${dev} > /dev/null
+	old_mountp="$(where_is_mounted ${dev})"
+
+	if [ -n "${old_mountp}" ]
 	then
-		mount -o remount,"${opts}" ${dev} $(where_is_mounted ${dev}) || panic "Remounting failed"
-		mount -o bind $(where_is_mounted ${dev}) ${mountp} || panic "Cannot bind-mount"
+		mount -o remount,"${opts}" "${dev}" "${old_mountp}" || panic "Remounting ${dev} ${opts} on ${old_mountp} failed"
+		mount -o bind "${old_mountp}" "${mountp}" || panic "Cannot bind-mount ${old_mountp} on ${mountp}"
 	else
 		mount -t $(get_fstype "${dev}") -o "${opts}" "${dev}" "${mountp}" || panic "Cannot mount ${dev} on ${mountp}"
 	fi
@@ -225,7 +256,7 @@ find_cow_device ()
 	pers_label="${1}"
 	cow_backing="/${pers_label}-backing"
 
-	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop)
+	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
 	do
 		for dev in $(subdevices "${sysblock}")
 		do
@@ -235,20 +266,24 @@ find_cow_device ()
 			then
 				echo "${devname}"
 				return
-			elif [ "$(get_fstype ${devname})" = "vfat" ]
-			then
-				# FIXME: all supported block devices should be scanned
-				mkdir -p "${cow_backing}"
-				try_mount "${devname}" "${cow_backing}" "rw"
-
-				if [ -e "${cow_backing}/${pers_label}" ]
-				then
-					echo $(setup_loop "${cow_backing}/${pers_label}" "loop" "/sys/block/loop*")
-					return 0
-				else
-					umount ${cow_backing}
-				fi
 			fi
+
+			case "$(get_fstype ${devname})" in
+				vfat|ext2|ext3|jffs2)
+					mkdir -p "${cow_backing}"
+					try_mount "${devname}" "${cow_backing}" "rw"
+
+					if [ -f "${cow_backing}/${pers_label}" ]
+					then
+						echo $(setup_loop "${cow_backing}/${pers_label}" "loop" "/sys/block/loop*")
+						return 0
+					else
+						umount ${cow_backing}
+					fi
+					;;
+				*)
+					;;
+			esac
 		done
 	done
 }
@@ -261,22 +296,21 @@ find_files ()
 	filenames="${1}"
 	snap_backing="/snap-backing"
 
-	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop)
+	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
 	do
 		for dev in $(subdevices "${sysblock}")
 		do
 			devname=$(sys2dev "${dev}")
 			devfstype="$(get_fstype ${devname})"
 
-			if [ "${devfstype}" = "vfat" ] ||  [ "${devfstype}" = "ext2" ] || [ "${devfstype}" = "ext3" ]
+			if is_supported_fs ${devfstype}
 			then
-				# FIXME: all supported block devices should be scanned
 				mkdir -p "${snap_backing}"
 				try_mount "${devname}" "${snap_backing}" "ro"
 
 				for filename in ${filenames}
-				do
-					if [ -e "${snap_backing}/${filename}" ]
+					do
+					if [ -f "${snap_backing}/${filename}" ]
 					then
 						echo "${devname} ${snap_backing} ${filename}"
 						return 0
@@ -306,3 +340,16 @@ get_mac ()
 
 	echo ${mac}
 }
+
+is_luks()
+{
+    devname="${1}"
+    if [ -x /sbin/cryptsetup ]
+    then
+	/sbin/cryptsetup isLuks "${devname}" 2>/dev/null || ret=${?}
+	return ${ret}
+    else
+	return 1
+    fi
+
+}