scripts/live-helpers: Fixes for set -e

[live-boot-grml.git] / scripts / live-helpers

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 807553a..771ab85 100644 (file)
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -35,8 +35,8 @@ get_fstype ()
        local FSSIZE
 
        # fstype misreports LUKS devices
-       is_luks "${1}"
-       if [ $? -eq 0 ]; then
+       if is_luks "${1}"
+       then
            /lib/udev/vol_id -t ${1} 2>/dev/null
            return
        fi
@@ -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
@@ -319,8 +321,8 @@ is_luks()
     devname="${1}"
     if [ -x /sbin/cryptsetup ]
     then
-       /sbin/cryptsetup isLuks "${devname}" 2>/dev/null
-       return $?
+       /sbin/cryptsetup isLuks "${devname}" 2>/dev/null || ret=${?}
+       return ${ret}
     else
        return 1
     fi