summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lamb <chris@chris-lamb.co.uk>2008-03-23 04:17:56 +0000
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:47:58 +0100
commit8d2f581c2fa170a7e573a2c2d9adbcd1a7df5e33 (patch)
treee8582c06cb42c23cd4cc3c9b23f685288946b3eb
parentbc986e631b2dcba0f5ce7c742d498f5820028f0b (diff)
downloadlive-boot-8d2f581c2fa170a7e573a2c2d9adbcd1a7df5e33.tar.gz
live-boot-8d2f581c2fa170a7e573a2c2d9adbcd1a7df5e33.zip
scripts/live-helpers: Cosmetic changes to loop-aes passphrase prompt
-rw-r--r--scripts/live-helpers8
1 files changed, 5 insertions, 3 deletions
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