scripts/live-helpers: Cosmetic changes to loop-aes passphrase prompt
authorChris Lamb <chris@chris-lamb.co.uk>
Sun, 23 Mar 2008 04:17:56 +0000 (04:17 +0000)
committerDaniel Baumann <daniel@debian.org>
Wed, 9 Mar 2011 16:47:58 +0000 (17:47 +0100)
scripts/live-helpers

index 807553a..203ee4c 100644 (file)
@@ -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