X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=d5ad29f6bc9be6ee410ddf55b9d25fd67cb24482;hb=a974d9cd39ed0ed6490c7894056c7c0666855994;hp=9c5bf219f1a7ef85782e9b4d974fcb916756e0c9;hpb=b81fd0c98e5ebc5fa2c5eb4bdb7f5019cd9d6f86;p=live-boot-grml.git

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 9c5bf21..d5ad29f 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -328,13 +328,13 @@ find_cow_device ()
 			fi
 
 			# Checking for a luks device
-			if [ -e /sbin/cryptsetup ] && /sbin/cryptsetup isLuks ${devname}
+			if [ "${PERSISTENT}" = "cryptsetup" ] && [ -e /sbin/cryptsetup ] && /sbin/cryptsetup isLuks ${devname}
 			then
 				while true
 				do
 					load_keymap
 
-					/lib/cryptsetup/askpass "Enter passphrase for ${pers_label} on ${devname}: " /sbin/cryptsetup -T 1 luksOpen ${devname} $(basename ${devname}) --key-file=-
+					/lib/cryptsetup/askpass "Enter passphrase for ${pers_label} on ${devname}: " | /sbin/cryptsetup -T 1 luksOpen ${devname} $(basename ${devname}) --key-file=-
 					error=${?}
 
 					devname="/dev/mapper/$(basename ${devname})"
@@ -367,7 +367,7 @@ find_cow_device ()
 			then
 				# do not mount the device to find for image files
 				# just skip this
-				break
+				continue
 			fi
 
 			case "$(get_fstype ${devname})" in