X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=70897d6a047b0897ac26ee764ad87a2c8ff8a4bb;hb=9683c4f087985d070ef8b77bdc1e284b55134490;hp=88752484cec2fca95b3e69905385fce0b7d7ac7e;hpb=f982fc4ca835c6fd962322d4faf8ec45a1002d38;p=live-boot-grml.git diff --git a/scripts/live-helpers b/scripts/live-helpers index 8875248..70897d6 100644 --- a/scripts/live-helpers +++ b/scripts/live-helpers @@ -299,6 +299,13 @@ find_cow_device () 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 | grep -v fd) do for dev in $(subdevices "${sysblock}") @@ -325,16 +332,16 @@ find_cow_device () fi case "$(get_fstype ${devname})" in - vfat|ext2|ext3|jffs2) + vfat|ext2|ext3|ext4|jffs2) mkdir -p "${cow_backing}" if ! try_mount "${devname}" "${cow_backing}" "rw" then break fi - if [ -f "${cow_backing}/${pers_label}" ] + if [ -f "${pers_fpath}" ] then - echo $(setup_loop "${cow_backing}/${pers_label}" "loop" "/sys/block/loop*") + echo $(setup_loop "${pers_fpath}" "loop" "/sys/block/loop*") return 0 else umount ${cow_backing}