[SCM] live-boot branch, debian-next, updated. debian/3.0_a22-1-25-gf885467

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit f11e6c940d7e9bb4c8d687237f128d3165fd4f72
Author: Tails developers <amnesia at boum.org>
Date:   Tue Nov 8 15:51:14 2011 +0100

    Making persistent-encryption=luks strict.
    
    When specified we completely ignore unencrypted media when probing for
    persistent media.

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 950bbda..912d800 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -324,12 +324,18 @@ find_cow_device ()
 			if echo "${black_listed_devices}" | grep -q -w "${devname}"
 			then
 				# skip this subdevice
-				break
+				continue
 			fi
 
 			# Checking for a luks device
-			if [ "${PERSISTENT_ENCRYPTION}" = "luks" ] && [ -e /sbin/cryptsetup ] && /sbin/cryptsetup isLuks ${devname}
+			if [ "${PERSISTENT_ENCRYPTION}" = "luks" ] && [ -e /sbin/cryptsetup ]
 			then
+				if ! /sbin/cryptsetup isLuks ${devname}
+				then
+					# we only look for encrypted subdevices
+					continue
+				fi
+
 				while true
 				do
 					load_keymap

-- 
live-boot