Adding debian version 2.0~a1-1.
[live-boot-grml.git] / scripts / live-helpers
index b0ad4b6..314c33f 100644 (file)
@@ -1,5 +1,4 @@
-#!/bin/sh
-# live-initramfs helper functions, used by live-initramfs on boot and by live-snapshot
+# live-boot helper functions, used by live-boot on boot and by live-snapshot
 
 if [ ! -x "/bin/fstype" ]
 then
@@ -7,10 +6,19 @@ then
        export PATH="${PATH}:/usr/lib/klibc/bin"
 fi
 
+# handle upgrade path from old udev (using udevinfo) to
+# recent versions of udev (using udevadm info)
+if [ -x /sbin/udevadm ]
+then
+       udevinfo='/sbin/udevadm info'
+else
+       udevinfo='udevinfo'
+fi
+
 sys2dev ()
 {
        sysdev=${1#/sys}
-       echo "/dev/$(udevinfo -q name -p ${sysdev} 2>/dev/null|| echo ${sysdev##*/})"
+       echo "/dev/$($udevinfo -q name -p ${sysdev} 2>/dev/null|| echo ${sysdev##*/})"
 }
 
 subdevices ()
@@ -29,27 +37,54 @@ subdevices ()
        echo ${r}
 }
 
-get_fstype ()
+is_supported_fs ()
 {
-       local FSTYPE
-       local FSSIZE
+       fstype="${1}"
 
-       # fstype misreports LUKS devices
-       if is_luks "${1}"
+       # Validate input first
+       if [ -z "${fstype}" ]
        then
-           /lib/udev/vol_id -t ${1} 2>/dev/null
-           return
+               return 1
        fi
 
-       eval $(fstype < ${1})
-
-       if [ "${FSTYPE}" != "unknown" ]
+       # Try to look if it is already supported by the kernel
+       if grep -q ${fstype} /proc/filesystems
        then
-               echo ${FSTYPE}
                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
 
-       /lib/udev/vol_id -t ${1} 2>/dev/null
+       return 1
+}
+
+get_fstype ()
+{
+       # udev (>= 146) no longer provides vol_id
+       if [ -x /lib/udev/vol_id ]
+       then
+               # lenny
+               /lib/udev/vol_id -t ${1} 2>/dev/null
+       else
+               # squeeze
+               /sbin/blkid -s TYPE -o value $1 2>/dev/null
+       fi
 }
 
 where_is_mounted ()
@@ -58,12 +93,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 -m1 "^${device} " /proc/mounts | cut -f2 -d ' '
        fi
-
-       return 1
 }
 
 lastline ()
@@ -106,14 +138,14 @@ 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"
 
                        mkdir -p "${mountp}"
-                       mount -t $(get_fstype "${dev}") -o ro "${dev}" "${mountp}"
+                       mount -t $(get_fstype "${dev}") -o ro "${dev}" "${mountp}" || log_warning_msg "cannot mount -t $(get_fstype ${dev}) -o ro ${dev} ${mountp}"
 
                        doumount=1
                fi
@@ -130,7 +162,7 @@ fs_size ()
 
        if [ -n "${doumount}" ]
        then
-               umount "${mountp}"
+               umount "${mountp}" || log_warning_msg "cannot umount ${mountp}"
                rmdir "${mountp}"
        fi
 
@@ -153,9 +185,15 @@ setup_loop ()
        local pattern=${3}
        local offset=${4}
        local encryption=${5}
+       local readonly=${6}
+
+       # the output of setup_loop is evaluated in other functions,
+       # modprobe leaks kernel options like "libata.dma=0"
+       # as "options libata dma=0" on stdout, causing serious
+       # problems therefor, so instead always avoid output to stdout
+       modprobe -q -b "${module}" 1>/dev/null
 
-       modprobe -q -b "${module}"
-       udevsettle
+       udevadm settle
 
        for loopdev in ${pattern}
        do
@@ -164,6 +202,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}"
@@ -219,44 +265,123 @@ try_mount ()
        dev="${1}"
        mountp="${2}"
        opts="${3}"
+       fstype="${4}"
+
+       old_mountp="$(where_is_mounted ${dev})"
 
-       if where_is_mounted ${dev} > /dev/null
+       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"
+               if [ "${opts}" != "ro" ]
+               then
+                       mount -o remount,"${opts}" "${dev}" "${old_mountp}" || panic "Remounting ${dev} ${opts} on ${old_mountp} failed"
+               fi
+
+               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}"
+               if [ -z "${fstype}" ]
+               then
+                       fstype=$(get_fstype "${dev}")
+               fi
+               mount -t "${fstype}" -o "${opts}" "${dev}" "${mountp}" || \
+               ( echo "SKIPPING: Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}" > live.log && return 0 )
        fi
 }
 
 find_cow_device ()
 {
+       # Returns a device containing a partition labeled "${pers_label}" or containing a file named the same way
+       #  in the latter case the partition containing the file is left mounted
+       #  if is not in black_listed_devices
        pers_label="${1}"
        cow_backing="/${pers_label}-backing"
+       black_listed_devices="${2}"
+
+       if [ -z "${PERSISTENT_PATH}" ]
+       then
+               pers_fpath=${cow_backing}/${pers_label}
+       else
+               pers_fpath=${cow_backing}/${PERSISTENT_PATH}/${pers_label}
+       fi
 
-       for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram)
+       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 echo "${black_listed_devices}" | grep -q "${devname}"
                        then
-                               echo "${devname}"
-                               return
+                               # skip this device enterely
+                               break
+                       fi
+
+                       # Checking for a luks device
+                       if [ "${PERSISTENT}" = "cryptsetup" ] && [ -e /sbin/cryptsetup ] && /sbin/cryptsetup isLuks ${devname}
+                       then
+                               while true
+                               do
+                                       load_keymap
+
+                                       /lib/cryptsetup/askpass "Enter passphrase for ${pers_label} on ${devname}: " | /sbin/cryptsetup -T 1 luksOpen ${devname} $(basename ${devname}) --key-file=-
+                                       error=${?}
+
+                                       devname="/dev/mapper/$(basename ${devname})"
+
+                                       if [ 0 -eq ${error} ]
+                                       then
+                                               unset error
+                                               break
+                                       fi
+
+                                       echo
+                                       echo -n "There was an error decrypting ${devname} ... Retry? [Y/n] " >&6
+                                       read answer
+
+                                       if [ "$(echo "${answer}" | cut -b1 | tr A-Z a-z)" = "n" ]
+                                       then
+                                               unset answer
+                                               break
+                                       fi
+                               done
+                       fi
+
+                       # udev (>= 146) no longer provides vol_id
+                       if [ -x /lib/udev/vol_id ]
+                       then
+                               # lenny
+                               if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${pers_label}" ]
+                               then
+                                       echo "${devname}"
+                                       return 0
+                               fi
+                       else
+                               # squeeze
+                               if [ "$(/sbin/blkid -s LABEL -o value $devname 2>/dev/null)" = "${pers_label}" ]
+                               then
+                                       echo "${devname}"
+                                       return 0
+                               fi
+                       fi
+
+                       if [ "${PERSISTENT}" = "nofiles" ]
+                       then
+                               # do not mount the device to find for image files
+                               # just skip this
+                               continue
                        fi
 
                        case "$(get_fstype ${devname})" in
-                               vfat|ext2|ext3|jffs2)
+                               vfat|ext2|ext3|ext4|jffs2)
                                        mkdir -p "${cow_backing}"
-                                       try_mount "${devname}" "${cow_backing}" "rw"
-
-                                       if [ -f "${cow_backing}/${pers_label}" ]
+                                       if try_mount "${devname}" "${cow_backing}" "rw"
                                        then
-                                               echo $(setup_loop "${cow_backing}/${pers_label}" "loop" "/sys/block/loop*")
-                                               return 0
-                                       else
-                                               umount ${cow_backing}
+                                               if [ -f "${pers_fpath}" ]
+                                               then
+                                                       echo $(setup_loop "${pers_fpath}" "loop" "/sys/block/loop*")
+                                                       return 0
+                                               else
+                                                       umount ${cow_backing} > /dev/null 2>&1 || true
+                                               fi
                                        fi
                                        ;;
                                *)
@@ -264,41 +389,50 @@ find_cow_device ()
                        esac
                done
        done
+       return 1
 }
 
 find_files ()
 {
-       # return the first of ${filenames} found on vfat and ext2/ext3 devices
+       # return the a string composed by device name, mountpoint an the first of ${filenames} found on a supported partition
        # FIXME: merge with above function
 
        filenames="${1}"
        snap_backing="/snap-backing"
+       black_listed_devices="${2}"
 
-       for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram)
+       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})"
 
-                       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"
+                       if echo "${black_listed_devices}" | grep -q "${devname}"
+                       then
+                               # skip this device enterely
+                               break
+                       fi
+
+                       if is_supported_fs ${devfstype}
+                       then
+                               mkdir -p "${snap_backing}"
 
+                               if try_mount "${devname}" "${snap_backing}" "ro" "${devfstype}"
+                               then
                                        for filename in ${filenames}
                                        do
                                                if [ -f "${snap_backing}/${filename}" ]
                                                then
                                                        echo "${devname} ${snap_backing} ${filename}"
+                                                       umount ${snap_backing}
                                                        return 0
                                                fi
                                        done
+                               fi
 
-                                       umount ${snap_backing}
-                                       ;;
-                       esac
+                               umount ${snap_backing}
+                       fi
                done
        done
 }