From: Chris Lamb <chris@chris-lamb.co.uk>
Date: Sun, 23 Mar 2008 04:17:56 +0000 (+0000)
Subject: scripts/live-helpers: Cosmetic changes to loop-aes passphrase prompt
X-Git-Tag: debian/2.0.15-1~582
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=8d2f581c2fa170a7e573a2c2d9adbcd1a7df5e33

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