[SCM] Debian Live initramfs hook branch, master, updated. 1.157.1-1-12-ga4a75b0

[Daniel Baumann]

The following commit has been merged in the master branch:
commit a4a75b0210749bd7e15e297ac287c9f50d00d079
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Apr 13 16:39:22 2009 +0200

    Adding prompt for user to enter password for luks encrypted persistency.

diff --git a/scripts/live-helpers b/scripts/live-helpers
index b2330bf..320000f 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -330,8 +330,39 @@ find_cow_device ()
 			# Checking for a luks device
 			if /sbin/cryptsetup isLuks ${devname}
 			then
-				cryptsetup luksOpen ${devname} $(basename ${devname})
-				devname="/dev/mapper/$(basename ${devname})"
+				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 the root filesystem ... 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}" ]

-- 
Debian Live initramfs hook