X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=fbf61fea8dfe4dd101da3ce0bc6cbc1a50c04352;hb=2c2184b6deff74fd2ea091edeee34efa08b74b09;hp=59bdb4fd673c9dc4c4d631b159af394ee5448915;hpb=3cd34c818ca9695d0b5a8bab80c0ef08544acfbf;p=live-boot-grml.git

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 59bdb4f..fbf61fe 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -104,7 +104,7 @@ where_is_mounted ()
 	if grep -q "^${device} " /proc/mounts
 	then
 		# return the first found
-		grep "^${device} " /proc/mounts | cut -f2 -d ' '
+		grep -m1 "^${device} " /proc/mounts | cut -f2 -d ' '
 	fi
 }
 
@@ -327,10 +327,47 @@ 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}"
-				return
+				return 0
 			fi
 
 			if [ "${PERSISTENT}" = "nofiles" ]
@@ -361,6 +398,7 @@ find_cow_device ()
 			esac
 		done
 	done
+	return 1
 }
 
 find_files ()