X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=b6762bc9b1071c5769595b21b670bfbad579f0ac;hb=478ce068a690a986456b8d8159e9c3937c364868;hp=3428cca72e67abc245609c10b94dca8fdbd44693;hpb=9be31760d902a1728a4b786f2a8844697bad5038;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 3428cca..b6762bc 100755
--- a/scripts/live
+++ b/scripts/live
@@ -479,7 +479,7 @@ matches_uuid ()
 	path="${1}"
 	uuid="$(cat /conf/uuid.conf)"
 
-	for try_uuid_file in "${mountpoint}/.disk/casper-uuid"*
+	for try_uuid_file in "${mountpoint}/.disk/live-uuid"*
 	do
 		[ -e "${try_uuid_file}" ] || continue
 
@@ -498,7 +498,7 @@ get_backing_device ()
 {
 	case "${1}" in
 		*.squashfs|*.ext2|*.ext3|*.jffs2)
-			echo $(setup_loop "${1}" "loop" "/sys/block/loop*" '0' "${LIVE_MEDIA_ENCRYPTION}")
+			echo $(setup_loop "${1}" "loop" "/sys/block/loop*" '0' "${LIVE_MEDIA_ENCRYPTION}" "${2}")
 			;;
 
 		*.dir)
@@ -965,7 +965,7 @@ setup_unionfs ()
 			rofslist="${image} ${rofslist}"
 		elif [ -f "${image}" ]
 		then
-			backdev=$(get_backing_device "${image}")
+			backdev=$(get_backing_device "${image}" "-r")
 			fstype=$(get_fstype "${backdev}")
 
 			if [ "${fstype}" = "unknown" ]