diff options
| author | Tails developers <amnesia@boum.org> | 2011-11-12 05:56:06 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-11-24 09:42:09 +0100 |
| commit | ef22a990570cd3658c7a693796e4470994b86fb9 (patch) | |
| tree | 11039a1cf8f71ceebeb0a696722c7b9427a2eed4 /scripts/live | |
| parent | 05dd30f7923913a060d7bef57b167386c988bc7c (diff) | |
| download | live-boot-ef22a990570cd3658c7a693796e4470994b86fb9.tar.gz live-boot-ef22a990570cd3658c7a693796e4470994b86fb9.zip | |
Changing persistent-encryption to accept a list TYPE... instead.
The comma-separated list TYPE... specifies which types of encryption
to allow for persistent media, and whether to allow plaintext media.
The possible TYPEs are the old {none, luks}, with default "none". The
only change is that this allow plaintext and encrypted media to be
used simultaneously.
Diffstat (limited to 'scripts/live')
| -rwxr-xr-x | scripts/live | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/scripts/live b/scripts/live index 970853c..c28314f 100755 --- a/scripts/live +++ b/scripts/live @@ -395,19 +395,23 @@ Arguments () export UNIONTYPE fi - if [ "${PERSISTENT_ENCRYPTION}" = "luks" ] + if [ -z "${PERSISTENT_ENCRYPTION}" ] + then + PERSISTENT_ENCRYPTION="none" + export PERSISTENT_ENCRYPTION + elif echo ${PERSISTENT_ENCRYPTION} | grep -qw luks then if ! modprobe dm-crypt then log_warning_msg "Unable to load module dm-crypt" - PERSISTENT_ENCRYPTION="none" + PERSISTENT_ENCRYPTION=$(echo ${PERSISTENT_ENCRYPTION} | sed -e 's/\<luks,\|,\?luks$//g') export PERSISTENT_ENCRYPTION fi if [ ! -x /lib/cryptsetup/askpass ] || [ ! -x /sbin/cryptsetup ] then log_warning_msg "cryptsetup in unavailable" - PERSISTENT_ENCRYPTION="none" + PERSISTENT_ENCRYPTION=$(echo ${PERSISTENT_ENCRYPTION} | sed -e 's/\<luks,\|,\?luks$//g') export PERSISTENT_ENCRYPTION fi fi |