scripts/live-helpers: Search / use case

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

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 807553a..6c03751 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
@@ -242,20 +244,24 @@ find_cow_device ()
                        then
                                echo "${devname}"
                                return
-                       elif [ "$(get_fstype ${devname})" = "vfat" ]
-                       then
-                               # FIXME: all supported block devices should be scanned
-                               mkdir -p "${cow_backing}"
-                               try_mount "${devname}" "${cow_backing}" "rw"
-
-                               if [ -e "${cow_backing}/${pers_label}" ]
-                               then
-                                       echo $(setup_loop "${cow_backing}/${pers_label}" "loop" "/sys/block/loop*")
-                                       return 0
-                               else
-                                       umount ${cow_backing}
-                               fi
                        fi
+
+                       case "$(get_fstype ${devname})" in
+                               vfat|ext2|ext3|jffs2)
+                                       mkdir -p "${cow_backing}"
+                                       try_mount "${devname}" "${cow_backing}" "rw"
+
+                                       if [ -f "${cow_backing}/${pers_label}" ]
+                                       then
+                                               echo $(setup_loop "${cow_backing}/${pers_label}" "loop" "/sys/block/loop*")
+                                               return 0
+                                       else
+                                               umount ${cow_backing}
+                                       fi
+                                       ;;
+                               *)
+                                       ;;
+                       esac
                done
        done
 }
@@ -275,23 +281,24 @@ find_files ()
                        devname=$(sys2dev "${dev}")
                        devfstype="$(get_fstype ${devname})"
 
-                       if [ "${devfstype}" = "vfat" ] ||  [ "${devfstype}" = "ext2" ] || [ "${devfstype}" = "ext3" ] || [ "${devfstype}" = "jffs2" ]
-                       then
-                               # FIXME: all supported block devices should be scanned
-                               mkdir -p "${snap_backing}"
-                               try_mount "${devname}" "${snap_backing}" "ro"
-
-                               for filename in ${filenames}
-                               do
-                                       if [ -e "${snap_backing}/${filename}" ]
-                                       then
-                                               echo "${devname} ${snap_backing} ${filename}"
-                                               return 0
-                                       fi
-                               done
-
-                               umount ${snap_backing}
-                       fi
+                       case "${devfstype}" in
+                               vfat|ext2|ext3|jffs2)
+                                       # FIXME: all supported block devices should be scanned
+                                       mkdir -p "${snap_backing}"
+                                       try_mount "${devname}" "${snap_backing}" "ro"
+
+                                       for filename in ${filenames}
+                                       do
+                                               if [ -f "${snap_backing}/${filename}" ]
+                                               then
+                                                       echo "${devname} ${snap_backing} ${filename}"
+                                                       return 0
+                                               fi
+                                       done
+
+                                       umount ${snap_backing}
+                                       ;;
+                       esac
                done
        done
 }
@@ -319,8 +326,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