X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=6edd51cd189bd7a660388a9f30291b0662f987dd;hb=6d5c38f8a3584268700602b6119572f5fb2be2fb;hp=0d97d108c7b38e8a70f143499d7ac135ce6edcf9;hpb=e4b9ce3049d5eceb4cb815087062a5bed0d6c2ce;p=live-boot-grml.git diff --git a/scripts/live-helpers b/scripts/live-helpers index 0d97d10..6edd51c 100644 --- a/scripts/live-helpers +++ b/scripts/live-helpers @@ -76,7 +76,17 @@ is_supported_fs () get_fstype () { - /lib/udev/vol_id -t ${1} 2>/dev/null + # udev >=146-1 no longer provides vol_id: + if [ -x /lib/udev/vol_id ] + then + /lib/udev/vol_id -t ${1} 2>/dev/null + else + eval $(blkid -o udev "${1}") + if [ -n "$ID_FS_TYPE" ] + then + echo "${ID_FS_TYPE}" + fi + fi } where_is_mounted () @@ -277,7 +287,8 @@ try_mount () then fstype=$(get_fstype "${dev}") fi - mount -t "${fstype}" -o "${opts}" "${dev}" "${mountp}" || panic "Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}" + mount -t "${fstype}" -o "${opts}" "${dev}" "${mountp}" || \ + ( echo "SKIPPING: Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}" > live.log && return 0 ) fi } @@ -339,10 +350,21 @@ find_cow_device () done fi - if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${pers_label}" ] + # udev >=146-1 no longer provides vol_id: + if [ -x /lib/udev/vol_id ] then - echo "${devname}" - return 0 + if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${pers_label}" ] + then + echo "${devname}" + return 0 + fi + else + eval $(blkid -o udev "${devname}") + if [ "$ID_FS_LABEL" = "${pers_label}" ] + then + echo "${devname}" + return 0 + fi fi if [ "${PERSISTENT}" = "nofiles" ] @@ -355,17 +377,15 @@ find_cow_device () case "$(get_fstype ${devname})" in vfat|ext2|ext3|ext4|jffs2) mkdir -p "${cow_backing}" - if ! try_mount "${devname}" "${cow_backing}" "rw" + if try_mount "${devname}" "${cow_backing}" "rw" then - break - fi - - if [ -f "${pers_fpath}" ] - then - echo $(setup_loop "${pers_fpath}" "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 ;; *)