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 f4dae34..771ab85 100644 (file)
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -1,16 +1,6 @@
 #!/bin/sh
 # live-initramfs helper functions, used by live-initramfs on boot and by live-snapshot
 
-if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
-then
-       MP_QUIET="-Q"
-elif [ "${BUILD_SYSTEM}" = "Debian" ]
-then
-       MP_QUIET="-q"
-else
-       MP_QUIET=""
-fi
-
 if [ ! -x "/bin/fstype" ]
 then
        # klibc not in path -> not in initramfs
@@ -25,7 +15,7 @@ sys2dev ()
 
 subdevices ()
 {
-       sysblock=$1
+       sysblock=${1}
        r=""
 
        for dev in "${sysblock}" "${sysblock}"/*
@@ -44,25 +34,32 @@ get_fstype ()
        local FSTYPE
        local FSSIZE
 
-       eval $(fstype < $1)
+       # fstype misreports LUKS devices
+       if is_luks "${1}"
+       then
+           /lib/udev/vol_id -t ${1} 2>/dev/null
+           return
+       fi
 
-       if [ "$FSTYPE" != "unknown" ]
+       eval $(fstype < ${1})
+
+       if [ "${FSTYPE}" != "unknown" ]
        then
-               echo $FSTYPE
+               echo ${FSTYPE}
                return 0
        fi
 
-       /lib/udev/vol_id -t $1 2>/dev/null
+       /lib/udev/vol_id -t ${1} 2>/dev/null
 }
 
 where_is_mounted ()
 {
-       device=$1
+       device=${1}
 
-       if grep -q "^$device " /proc/mounts
+       if grep -q "^${device} " /proc/mounts
        then
-               grep "^$device " /proc/mounts | read d mountpoint rest
-               echo $mountpoint
+               grep "^${device} " /proc/mounts | read d mountpoint rest
+               echo ${mountpoint}
                return 0
        fi
 
@@ -101,7 +98,7 @@ base_path ()
 fs_size ()
 {
        # Returns used/free fs kbytes + 5% more
-       # You could pass a block device as $1 or the mount point as $2
+       # You could pass a block device as ${1} or the mount point as ${2}
 
        dev="${1}"
        mountp="${2}"
@@ -111,7 +108,7 @@ fs_size ()
        then
                mountp=$(where_is_mounted "${dev}")
 
-               if [ "$?" -gt 0 ]
+               if [ "${?}" -gt 0 ]
                then
                        mountp="/mnt/tmp_fs_size"
 
@@ -151,18 +148,18 @@ load_keymap ()
 
 setup_loop ()
 {
-       local fspath=$1
-       local module=$2
-       local pattern=$3
-       local offset=$4
-       local encryption=$5
+       local fspath=${1}
+       local module=${2}
+       local pattern=${3}
+       local offset=${4}
+       local encryption=${5}
 
-       modprobe ${MP_QUIET} -b "$module"
+       modprobe -q -b "${module}"
        udevsettle
 
-       for loopdev in $pattern
+       for loopdev in ${pattern}
        do
-               if [ "$(cat $loopdev/size)" -eq 0 ]
+               if [ "$(cat ${loopdev}/size)" -eq 0 ]
                then
                        dev=$(sys2dev "${loopdev}")
                        options=''
@@ -181,12 +178,13 @@ 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=$?
+                                       error=${?}
                                        exec 9<&-
                                        rm -f /tmp/passphrase
 
@@ -196,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
@@ -207,7 +206,7 @@ setup_loop ()
                                done
                        fi
 
-                       echo "$dev"
+                       echo "${dev}"
                        return 0
                fi
        done
@@ -241,9 +240,9 @@ find_cow_device ()
                do
                        devname=$(sys2dev "${dev}")
 
-                       if [ "$(/lib/udev/vol_id -l $devname 2>/dev/null)" = "${pers_label}" ]
+                       if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${pers_label}" ]
                        then
-                               echo "$devname"
+                               echo "${devname}"
                                return
                        elif [ "$(get_fstype ${devname})" = "vfat" ]
                        then
@@ -265,7 +264,7 @@ find_cow_device ()
 
 find_files ()
 {
-       # return the first of $filenames found on vfat and ext2/ext3 devices
+       # return the first of ${filenames} found on vfat and ext2/ext3 devices
        # FIXME: merge with above function
 
        filenames="${1}"
@@ -278,7 +277,7 @@ find_files ()
                        devname=$(sys2dev "${dev}")
                        devfstype="$(get_fstype ${devname})"
 
-                       if [ "${devfstype}" = "vfat" ] ||  [ "${devfstype}" = "ext2" ] || [ "${devfstype}" = "ext3" ]
+                       if [ "${devfstype}" = "vfat" ] ||  [ "${devfstype}" = "ext2" ] || [ "${devfstype}" = "ext3" ] || [ "${devfstype}" = "jffs2" ]
                        then
                                # FIXME: all supported block devices should be scanned
                                mkdir -p "${snap_backing}"
@@ -298,3 +297,34 @@ find_files ()
                done
        done
 }
+
+get_mac ()
+{
+       mac=""
+
+       for adaptor in /sys/class/net/*
+       do
+               status="$(cat ${adaptor}/iflink)"
+
+               if [ "${status}" -eq 2 ]
+               then
+                       mac="$(cat ${adaptor}/address)"
+                       mac="$(echo ${mac} | sed 's/:/-/g' | tr '[a-z]' '[A-Z]')"
+               fi
+       done
+
+       echo ${mac}
+}
+
+is_luks()
+{
+    devname="${1}"
+    if [ -x /sbin/cryptsetup ]
+    then
+       /sbin/cryptsetup isLuks "${devname}" 2>/dev/null || ret=${?}
+       return ${ret}
+    else
+       return 1
+    fi
+
+}