X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=31093563f1404c83b7b397ef1aa2292d1aba8054;hb=f12da76bfe6fa2d134788541d7c74512a3ebb17a;hp=a9c4fbe7079e973c289ed7199251816e1f53aa75;hpb=5748431e0be129d18226eff9aff736f3eadc34fd;p=live-boot-grml.git diff --git a/scripts/live-helpers b/scripts/live-helpers index a9c4fbe..3109356 100644 --- a/scripts/live-helpers +++ b/scripts/live-helpers @@ -46,9 +46,9 @@ storage_devices() do fulldevname=$(sys2dev "${sysblock}") - if echo "${black_listed_devices}" | grep -qw "${fulldevname}" || \ + if echo "${black_listed_devices}" | grep -qe "\<${fulldevname}\>" || \ [ -n "${white_listed_devices}" ] && \ - echo "${white_listed_devices}" | grep -vqw "${fulldevname}" + echo "${white_listed_devices}" | grep -qve "\<${fulldevname}\>" then # skip this device entirely continue @@ -58,7 +58,7 @@ storage_devices() do devname=$(sys2dev "${dev}") - if echo "${black_listed_devices}" | grep -qw "${devname}" + if echo "${black_listed_devices}" | grep -qe "\<${devname}\>" then # skip this subdevice continue @@ -234,7 +234,7 @@ setup_loop () fi fi - if [ 0 -lt "${offset}" ] + if [ -n "${offset}" ] && [ 0 -lt "${offset}" ] then options="${options} -o ${offset}" fi @@ -311,137 +311,147 @@ try_mount () fi } -find_cow_device () +open_luks_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. - # Additionally, if the white_listed_devices list is non-empty, the - # parent block device of the returned device must be part of this list. - pers_label="${1}" - cow_backing="/${pers_label}-backing" - black_listed_devices="${2}" - white_listed_devices="${3}" - - if [ -z "${PERSISTENT_PATH}" ] + dev="${1}" + name="$(basename ${dev})" + opts="--key-file=-" + if [ -n "${PERSISTENT_READONLY}" ] then - pers_fpath=${cow_backing}/${pers_label} - else - pers_fpath=${cow_backing}/${PERSISTENT_PATH}/${pers_label} + opts="${opts} --readonly" fi - for dev in $(storage_devices "${black_listed_devices}" "${white_listed_devices}") - do - # Checking for a luks device - if [ "${PERSISTENT_ENCRYPTION}" = "luks" ] && [ -e /sbin/cryptsetup ] - then - if ! modprobe dm-crypt - then - log_warning_msg "Unable to load module dm-crypt" - continue - fi - - if ! /sbin/cryptsetup isLuks ${dev} - then - # we only look for encrypted subdevices - continue - fi - - while true - do - load_keymap - - /lib/cryptsetup/askpass "Enter passphrase for ${pers_label} on ${dev}: " | /sbin/cryptsetup -T 1 luksOpen ${dev} $(basename ${dev}) --key-file=- - error=${?} + load_keymap - dev="/dev/mapper/$(basename ${dev})" - - if [ 0 -eq ${error} ] - then - unset error - break - fi - - echo >&6 - echo -n "There was an error decrypting ${dev} ... Retry? [Y/n] " >&6 - read answer - - if [ "$(echo "${answer}" | cut -b1 | tr A-Z a-z)" = "n" ] - then - unset answer - # skip to next subdevice - continue 2 - fi - done - fi + while true + do + /lib/cryptsetup/askpass "Enter passphrase for ${dev}: " | \ + /sbin/cryptsetup -T 1 luksOpen ${dev} ${name} ${opts} - if echo ${PERSISTENT_STORAGE} | grep -qw filesystem && [ "$(/sbin/blkid -s LABEL -o value $dev 2>/dev/null)" = "${pers_label}" ] + if [ 0 -eq ${?} ] then - echo "${dev}" + luks_device="/dev/mapper/${name}" + echo ${luks_device} return 0 fi - if ! echo ${PERSISTENT_STORAGE} | grep -qw file - then - # do not mount the device to find for image files - # just skip this - continue - fi - - devfstype="$(get_fstype ${dev})" + echo >&6 + echo -n "There was an error decrypting ${dev} ... Retry? [Y/n] " >&6 + read answer - if is_supported_fs ${devfstype} + if [ "$(echo "${answer}" | cut -b1 | tr A-Z a-z)" = "n" ] then - mkdir -p "${cow_backing}" - if try_mount "${dev}" "${cow_backing}" "rw" - then - 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 + return 2 fi done - return 1 } -find_files () +find_persistent_media () { - # return the a string composed by device name, mountpoint an the first of ${filenames} found on a supported partition - # if is not in black_listed_devices. - # Additionally, if the white_listed_devices list is non-empty, the - # parent block device of the returned device must be part of this list. - # FIXME: merge with above function - - filenames="${1}" - snap_backing="/snap-backing" - black_listed_devices="${2}" - white_listed_devices="${3}" + # Scans devices for overlays and snapshots, and returns a whitespace + # separated list of how to use them. Only overlays with a partition + # label or file name in ${overlays} are returned, and ditto for + # snapshots with labels in ${snapshots}. + # + # When scanning a LUKS device, the user will be asked to enter the + # passphrase; on failure to enter it, or if no persistent partitions + # or files were found, the LUKS device is closed. + # + # For a snapshot file the return value is ${label}=${snapdata}", where + # ${snapdata} is the parameter used for try_snap(). + # + # For all other cases (overlay/snapshot partition and overlay file) the + # return value is "${label}=${device}", where ${device} a device that + # can mount the content. In the case of an overlay file, the device + # containing the file will remain mounted as a side-effect. + # + # No devices in ${black_listed_devices} will be scanned, and if + # ${white_list_devices} is non-empty, only devices in it will be + # scanned. + + overlays="${1}" + snapshots="${2}" + black_listed_devices="${3}" + white_listed_devices="${4}" for dev in $(storage_devices "${black_listed_devices}" "${white_listed_devices}") do - devfstype="$(get_fstype ${dev})" + luks_device="" + + # Checking for a luks device + if echo ${PERSISTENT_ENCRYPTION} | grep -qe "\" && \ + /sbin/cryptsetup isLuks ${dev} + then + if luks_device=$(open_luks_device "${dev}") + then + dev="${luks_device}" + else + # skip $dev since we failed/chose not to open it + continue + fi + elif echo ${PERSISTENT_ENCRYPTION} | grep -qve "\" + then + # skip $dev since we don't allow unencrypted storage + continue + fi - if is_supported_fs ${devfstype} + if echo ${PERSISTENT_STORAGE} | grep -qe "\" then - mkdir -p "${snap_backing}" + for label in ${overlays} ${snapshots} + do + if [ "$(/sbin/blkid -s LABEL -o value $dev 2>/dev/null)" = "${label}" ] + then + overlays=$(echo ${overlays} | sed -e "s|\<${label}\>||") + snapshots=$(echo ${snapshots} | sed -e "s|\<${label}\>||") + echo "${label}=${dev}" + # skip to the next device + continue 2 + fi + done + fi - if try_mount "${dev}" "${snap_backing}" "ro" "${devfstype}" + if echo ${PERSISTENT_STORAGE} | grep -qe "\" + then + devfstype="$(get_fstype ${dev})" + overlay_on_dev="" + snapshot_on_dev="" + backing="/$(basename ${dev})-backing" + mkdir -p "${backing}" + if is_supported_fs ${devfstype} && try_mount "${dev}" "${backing}" "rw" "${devfstype}" then - for filename in ${filenames} + for label in ${overlays} do - if [ -f "${snap_backing}/${filename}" ] + path=${backing}/${PERSISTENT_PATH}${label} + if [ -f "${path}" ] then - echo "${dev} ${snap_backing} ${filename}" - umount ${snap_backing} - return 0 + overlays=$(echo ${overlays} | sed -e "s|\<${label}\>||") + overlay_on_dev="yes" + echo "${label}=$(setup_loop "${path}" "loop" "/sys/block/loop*")" fi done + + for label in ${snapshots} + do + for ext in squashfs cpio.gz ext2 ext3 ext4 jffs2 + do + path="${PERSISTENT_PATH}${label}.${ext}" + if [ -f "${backing}/${path}" ] + then + snapshots=$(echo ${snapshots} | sed -e "s|\<${label}\>||") + snapshot_on_dev="yes" + echo "${label}=${dev}:${backing}:${path}" + fi + done + done + fi + if [ -z "${overlay_on_dev}" ] + then + umount ${backing} > /dev/null 2>&1 || true + if [ -z "${snapshot_on_dev}" ] && [ -n "${luks_device}" ] && /sbin/cryptsetup status "${luks_device}" 1> /dev/null + then + /sbin/cryptsetup luksClose "${luks_device}" + fi fi - umount ${snap_backing} fi done }