X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=6c03751035f7dae15bb879df8923e4d3e4727875;hb=31e39a4551eb81d8542047ba382408bff4391fe5;hp=f4dae34eea61d67f71b3cef257a3629df32e7bc6;hpb=32e6d9c217846ec5f6d2da9b773a34c4d1970348;p=live-boot-grml.git diff --git a/scripts/live-helpers b/scripts/live-helpers index f4dae34..6c03751 100644 --- 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 + + eval $(fstype < ${1}) - if [ "$FSTYPE" != "unknown" ] + 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&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,31 +240,35 @@ 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 - # 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 } 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,23 +281,55 @@ find_files () devname=$(sys2dev "${dev}") devfstype="$(get_fstype ${devname})" - if [ "${devfstype}" = "vfat" ] || [ "${devfstype}" = "ext2" ] || [ "${devfstype}" = "ext3" ] - then - # FIXME: all supported block devices should be scanned - mkdir -p "${snap_backing}" - try_mount "${devname}" "${snap_backing}" "ro" + 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 +} - for filename in ${filenames} - do - if [ -e "${snap_backing}/${filename}" ] - then - echo "${devname} ${snap_backing} ${filename}" - return 0 - fi - done +get_mac () +{ + mac="" - umount ${snap_backing} - fi - done + 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 + }