Adding upstream version 3.0~b7.

[live-boot-grml.git] / scripts / boot / 9990-misc-helpers.sh

diff --git a/scripts/boot/9990-misc-helpers.sh b/scripts/boot/9990-misc-helpers.sh
index 3455045..ace130b 100755 (executable)
--- a/scripts/boot/9990-misc-helpers.sh
+++ b/scripts/boot/9990-misc-helpers.sh
@@ -940,7 +940,7 @@ find_persistence_media ()
        local white_listed_devices="${2}"
        local ret=""
 
-       local black_listed_devices="$(what_is_mounted_on /live/image)"
+       local black_listed_devices="$(what_is_mounted_on /live/medium)"
 
        for dev in $(storage_devices "${black_listed_devices}" "${white_listed_devices}")
        do
@@ -1258,9 +1258,14 @@ get_custom_mounts ()
                        continue
                fi
 
-               local include_list="${backing}/${persistence_list}"
-               if [ ! -r "${include_list}" ]
+               local include_list
+               if [ -r "${backing}/${persistence_list}" ]
                then
+                       include_list="${backing}/${persistence_list}"
+               elif [ -r "${backing}/${old_persistence_list}" ]
+               then
+                       include_list="${backing}/${old_persistence_list}"
+               else
                        continue
                fi