X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=6c03751035f7dae15bb879df8923e4d3e4727875;hb=31e39a4551eb81d8542047ba382408bff4391fe5;hp=5e1730bf652ea7a93ee2e594a5dc99ed2a38abc0;hpb=7f63779595a2e498fbe051e441d2e5f41fa1f419;p=live-boot-grml.git

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 5e1730b..6c03751 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -34,6 +34,13 @@ 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" ]
@@ -171,9 +178,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 +194,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
@@ -235,20 +244,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
 }
@@ -268,23 +281,24 @@ find_files ()
 			devname=$(sys2dev "${dev}")
 			devfstype="$(get_fstype ${devname})"
 
-			if [ "${devfstype}" = "vfat" ] ||  [ "${devfstype}" = "ext2" ] || [ "${devfstype}" = "ext3" ]
-			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}" ]
-					then
-						echo "${devname} ${snap_backing} ${filename}"
-						return 0
-					fi
-				done
-
-				umount ${snap_backing}
-			fi
+			case "${devfstype}" in
+				vfat|ext2|ext3|jffs2)
+					# FIXME: all supported block devices should be scanned
+					mkdir -p "${snap_backing}"
+					try_mount "${devname}" "${snap_backing}" "ro"
+
+					for filename in ${filenames}
+					do
+						if [ -f "${snap_backing}/${filename}" ]
+						then
+							echo "${devname} ${snap_backing} ${filename}"
+							return 0
+						fi
+					done
+
+					umount ${snap_backing}
+					;;
+			esac
 		done
 	done
 }
@@ -306,3 +320,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
+
+}