X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=f99fa5674d3da0505f6f3b2be1b514014e21db57;hb=bd2cfbec5fe67ea696162c1caa5c80187a070bee;hp=9cf3b9982f4ee7dde677239418deb497a04b3c15;hpb=b15f95e06e40a70ed75c30b31cee89d43ec8196b;p=live-boot-grml.git diff --git a/scripts/live-helpers b/scripts/live-helpers index 9cf3b99..f99fa56 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}"/* @@ -39,34 +29,52 @@ subdevices () echo ${r} } +is_supported_fs () +{ + # FIXME: do something better like the scan of supported filesystems + fstype="${1}" + + case ${fstype} in + vfat|iso9660|udf|ext2|ext3|ntfs|jffs2) + return 0 + ;; + esac + + return 1 +} + 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 - return 0 + # return the first found + grep "^${device} " /proc/mounts | cut -f2 -d ' ' fi - - return 1 } lastline () @@ -89,11 +97,11 @@ base_path () do if echo "${mounts}" | grep -qs "^${testpath}" then - set -- `echo "${mounts}" | grep "^${testpath}" | lastline` + set -- $(echo "${mounts}" | grep "^${testpath}" | lastline) echo ${1} break else - testpath=`dirname $testpath` + testpath=$(dirname $testpath) fi done } @@ -101,7 +109,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}" @@ -109,9 +117,9 @@ fs_size () if [ -z "${mountp}" ] then - mountp=$(where_is_mounted "${dev}") + mountp="$(where_is_mounted ${dev})" - if [ "$?" -gt 0 ] + if [ -z "${mountp}" ] then mountp="/mnt/tmp_fs_size" @@ -151,22 +159,31 @@ load_keymap () setup_loop () { - local fspath=$1 - local module=$2 - local pattern=$3 - local offset=$4 - local encryption=$5 - - modprobe ${MP_QUIET} -b "$module" + local fspath=${1} + local module=${2} + local pattern=${3} + local offset=${4} + local encryption=${5} + local readonly=${6} + + 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='' + if [ -n ${readonly} ] + then + if losetup --help 2>&1 | grep -q -- "-r\b" + then + options="${options} -r" + fi + fi + if [ 0 -lt "${offset}" ] then options="${options} -o ${offset}" @@ -181,12 +198,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 +226,7 @@ setup_loop () done fi - echo "$dev" + echo "${dev}" return 0 fi done @@ -221,10 +240,12 @@ try_mount () mountp="${2}" opts="${3}" - if where_is_mounted ${dev} > /dev/null + old_mountp="$(where_is_mounted ${dev})" + + if [ -n "${old_mountp}" ] then - mount -o remount,"${opts}" ${dev} $(where_is_mounted ${dev}) || panic "Remounting failed" - mount -o bind $(where_is_mounted ${dev}) ${mountp} || panic "Cannot bind-mount" + mount -o remount,"${opts}" "${dev}" "${old_mountp}" || panic "Remounting ${dev} ${opts} on ${old_mountp} failed" + mount -o bind "${old_mountp}" "${mountp}" || panic "Cannot bind-mount ${old_mountp} on ${mountp}" else mount -t $(get_fstype "${dev}") -o "${opts}" "${dev}" "${mountp}" || panic "Cannot mount ${dev} on ${mountp}" fi @@ -235,58 +256,61 @@ find_cow_device () pers_label="${1}" cow_backing="/${pers_label}-backing" - for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop) + for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd) do for dev in $(subdevices "${sysblock}") 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}" snap_backing="/snap-backing" - for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop) + for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd) do for dev in $(subdevices "${sysblock}") do devname=$(sys2dev "${dev}") devfstype="$(get_fstype ${devname})" - if [ "${devfstype}" = "vfat" ] || [ "${devfstype}" = "ext2" ] || [ "${devfstype}" = "ext3" ] + if is_supported_fs ${devfstype} 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}" ] + do + if [ -f "${snap_backing}/${filename}" ] then echo "${devname} ${snap_backing} ${filename}" return 0 @@ -298,3 +322,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 + +}