Adding upstream version 4.0~a11.

[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 83b822d..5c5341c 100755 (executable)
--- a/scripts/boot/9990-misc-helpers.sh
+++ b/scripts/boot/9990-misc-helpers.sh
@@ -938,7 +938,7 @@ find_persistence_media ()
        white_listed_devices="${2}"
        ret=""
 
-       black_listed_devices="$(what_is_mounted_on /live/medium)"
+       black_listed_devices="$(what_is_mounted_on /live/medium) $(what_is_mounted_on /live/findiso) $(what_is_mounted_on /live/fromiso)"
 
        for dev in $(storage_devices "${black_listed_devices}" "${white_listed_devices}")
        do
@@ -989,6 +989,21 @@ find_persistence_media ()
                        result=$(probe_for_file_name "${overlays}" ${dev})
                        if [ -n "${result}" ]
                        then
+                               local loopdevice
+                               loopdevice=${result##*=}
+                               if is_in_comma_sep_list luks ${PERSISTENCE_ENCRYPTION} && is_luks_partition ${loopdevice}
+                               then
+                                       local luksfile
+                                       luksfile=""
+                                       if luksfile=$(open_luks_device "${loopdevice}")
+                                       then
+                                               result=${result%%=*}
+                                               result="${result}=${luksfile}"
+                                       else
+                                               losetup -d $loopdevice
+                                               result=""
+                                       fi
+                               fi
                                ret="${ret} ${result}"
                                continue
                        fi