X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=fdf7b38efa5fa88d490ba618cb3869f984295b1d;hb=f7f71ad15e3cfa56b4bb79f1552281d93c5cd215;hp=5e1730bf652ea7a93ee2e594a5dc99ed2a38abc0;hpb=7f63779595a2e498fbe051e441d2e5f41fa1f419;p=live-boot-grml.git diff --git a/scripts/live-helpers b/scripts/live-helpers index 5e1730b..fdf7b38 100644 --- a/scripts/live-helpers +++ b/scripts/live-helpers @@ -29,11 +29,55 @@ subdevices () echo ${r} } +is_supported_fs () +{ + fstype="${1}" + + # Validate input first + if [ -z "${fstype}" ] + then + return 1 + fi + + # Try to look if it is already supported by the kernel + if grep -q ${fstype} /proc/filesystems + then + return 0 + else + # Then try to add support for it the gentle way using the initramfs capabilities + modprobe ${fstype} + if grep -q ${fstype} /proc/filesystems + then + return 0 + # Then try the hard way if /root is already reachable + else + kmodule="/root/lib/modules/`uname -r`/${fstype}/${fstype}.ko" + if [ -e "${kmodule}" ] + then + insmod "${kmodule}" + if grep -q ${fstype} /proc/filesystems + then + return 0 + fi + fi + fi + fi + + return 1 +} + get_fstype () { local FSTYPE local FSSIZE + # 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" ] @@ -51,12 +95,9 @@ where_is_mounted () 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 () @@ -99,9 +140,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" @@ -146,9 +187,18 @@ setup_loop () local pattern=${3} local offset=${4} local encryption=${5} + local readonly=${6} modprobe -q -b "${module}" - udevsettle + + if [ -x /sbin/udevadm ] + then + # lenny + udevadm settle + else + # etch + udevsettle + fi for loopdev in ${pattern} do @@ -157,6 +207,14 @@ setup_loop () 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}" @@ -171,9 +229,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&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 @@ -211,10 +271,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 @@ -225,7 +287,7 @@ 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 @@ -235,20 +297,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 } @@ -261,22 +327,21 @@ find_files () 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 @@ -306,3 +371,16 @@ get_mac () 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 + +}