X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fboot%2F9990-misc-helpers.sh;h=ace130b58d94e9269fd3ceba194156a5ef961896;hb=fb8c15c31e111394f77cc37962a08445ecd856ff;hp=3455045e64aea92cac9f2b2f520e7acb0dab15c5;hpb=b240d98d789fdce75a85a63dcbc0a5008b003d04;p=live-boot-grml.git diff --git a/scripts/boot/9990-misc-helpers.sh b/scripts/boot/9990-misc-helpers.sh index 3455045..ace130b 100755 --- 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