From 8860c59f82e44e0d1752042fcaf11c69bd4677e3 Mon Sep 17 00:00:00 2001 From: Tails developers Date: Tue, 8 Nov 2011 15:40:17 +0100 Subject: [PATCH] Adding persistent-encryption={none|luks}. This is the way to control whether to use encrypted persistent media, instead of the (from this commit on) obsolete persistent=cryptsetup. --- scripts/live | 5 +++++ scripts/live-helpers | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/live b/scripts/live index 6080841..bd7d9c4 100755 --- a/scripts/live +++ b/scripts/live @@ -253,6 +253,11 @@ Arguments () export PERSISTENT ;; + persistent-encryption=*) + PERSISTENT_ENCRYPTION="${ARGUMENT#*=}" + export PERSISTENT_ENCRYPTION + ;; + persistent-media=*) PERSISTENT_MEDIA="${ARGUMENT#*=}" export PERSISTENT_MEDIA diff --git a/scripts/live-helpers b/scripts/live-helpers index 73d9f9d..950bbda 100644 --- a/scripts/live-helpers +++ b/scripts/live-helpers @@ -328,7 +328,7 @@ find_cow_device () fi # Checking for a luks device - if [ "${PERSISTENT}" = "cryptsetup" ] && [ -e /sbin/cryptsetup ] && /sbin/cryptsetup isLuks ${devname} + if [ "${PERSISTENT_ENCRYPTION}" = "luks" ] && [ -e /sbin/cryptsetup ] && /sbin/cryptsetup isLuks ${devname} then while true do -- 2.1.4