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 (file)
--- 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