X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=c4fca957f7a5b76220497a13d1f8c56b1842486f;hb=6c6c31fe8348213396d7bd2dcfea72e0299debf9;hp=89708341f969811815c0481607878a0551a3befa;hpb=d5b20626bc2cab7926097d39e6a8cba146dd361a;p=live-boot-grml.git

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 8970834..c4fca95 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -6,10 +6,19 @@ then
 	export PATH="${PATH}:/usr/lib/klibc/bin"
 fi
 
+# handle upgrade path from old udev (using udevinfo) to
+# recent versions of udev (using udevadm info)
+if [ -x /sbin/udevadm ]
+then
+	udevinfo='/sbin/udevadm info'
+else
+	udevinfo='udevinfo'
+fi
+
 sys2dev ()
 {
 	sysdev=${1#/sys}
-	echo "/dev/$(udevinfo -q name -p ${sysdev} 2>/dev/null|| echo ${sysdev##*/})"
+	echo "/dev/$($udevinfo -q name -p ${sysdev} 2>/dev/null|| echo ${sysdev##*/})"
 }
 
 subdevices ()
@@ -318,6 +327,43 @@ find_cow_device ()
 				break
 			fi
 
+			# Checking for a luks device
+			if [ -e /sbin/cryptsetup ] && /sbin/cryptsetup isLuks ${devname}
+			then
+				while true
+				do
+					load_keymap
+
+					echo -n "Enter passphrase for ${pers_label} on ${devname}: " >&6
+					read -s passphrase
+					echo "${passphrase}" > /tmp/passphrase
+					unset passphrase
+					exec 9</tmp/passphrase
+					/sbin/cryptsetup luksOpen ${devname} $(basename ${devname})
+					error=${?}
+					exec 9<&-
+					rm -f /tmp/passphrase
+
+					devname="/dev/mapper/$(basename ${devname})"
+
+					if [ 0 -eq ${error} ]
+					then
+						unset error
+						break
+					fi
+
+					echo
+					echo -n "There was an error decrypting ${devname} ... Retry? [Y/n] " >&6
+					read answer
+
+					if [ "$(echo "${answer}" | cut -b1 | tr A-Z a-z)" = "n" ]
+					then
+						unset answer
+						break
+					fi
+				done
+			fi
+
 			if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${pers_label}" ]
 			then
 				echo "${devname}"
@@ -332,7 +378,7 @@ find_cow_device ()
 			fi
 
 			case "$(get_fstype ${devname})" in
-				vfat|ext2|ext3|jffs2)
+				vfat|ext2|ext3|ext4|jffs2)
 					mkdir -p "${cow_backing}"
 					if ! try_mount "${devname}" "${cow_backing}" "rw"
 					then