diff options
| author | Tails developers <amnesia@boum.org> | 2011-11-08 15:51:14 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-11-24 09:42:08 +0100 |
| commit | f11e6c940d7e9bb4c8d687237f128d3165fd4f72 (patch) | |
| tree | 95d2b6357ddd5f5ffc1e8cb16144ea6cb32ad44d /scripts | |
| parent | 8860c59f82e44e0d1752042fcaf11c69bd4677e3 (diff) | |
| download | live-boot-f11e6c940d7e9bb4c8d687237f128d3165fd4f72.tar.gz live-boot-f11e6c940d7e9bb4c8d687237f128d3165fd4f72.zip | |
Making persistent-encryption=luks strict.
When specified we completely ignore unencrypted media when probing for
persistent media.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/live-helpers | 10 |
1 files 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 |