X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=89708341f969811815c0481607878a0551a3befa;hb=refs%2Ftags%2Fdebian%2F1.154.7-1;hp=88752484cec2fca95b3e69905385fce0b7d7ac7e;hpb=f982fc4ca835c6fd962322d4faf8ec45a1002d38;p=live-boot-grml.git diff --git a/scripts/live-helpers b/scripts/live-helpers index 8875248..8970834 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}") @@ -332,9 +339,9 @@ find_cow_device () 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}