[SCM] debian-live/live-initramfs branch, master, updated. 1.124.1-1-2-g4c7372d

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 4c7372df6ed707cdc475ec4a645cc4fa1ee6f9ba
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sun Mar 23 04:17:56 2008 +0000

    scripts/live-helpers: Cosmetic changes to loop-aes passphrase prompt

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 807553a..203ee4c 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -178,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=${?}
@@ -193,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

-- 
debian-live/live-initramfs