From f11e6c940d7e9bb4c8d687237f128d3165fd4f72 Mon Sep 17 00:00:00 2001
From: Tails developers <amnesia@boum.org>
Date: Tue, 8 Nov 2011 15:51:14 +0100
Subject: [PATCH] Making persistent-encryption=luks strict.

When specified we completely ignore unencrypted media when probing for
persistent media.
---
 scripts/live-helpers | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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
-- 
2.1.4