[SCM] live-boot branch, debian-next, updated. debian/3.0_a22-1-25-gf885467

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 5d975eaa4e1bc4094c8d3cca3e9e1087dc0d061b
Author: Tails developers <amnesia at boum.org>
Date:   Tue Nov 8 21:01:33 2011 +0100

    Removing now obsolete persistent=* arguments.
    
    These type of options has have been replaced by persistent-encryption
    and persistent-storage.

diff --git a/scripts/live b/scripts/live
index 92e9d17..24dc468 100755
--- a/scripts/live
+++ b/scripts/live
@@ -244,15 +244,6 @@ Arguments ()
 				export PERSISTENT
 				;;
 
-			persistent=*)
-				PERSISTENT="${ARGUMENT#persistent=}"
-				if [ -z "${PERSISTENT}" ]
-				then
-					PERSISTENT="Yes"
-				fi
-				export PERSISTENT
-				;;
-
 			persistent-encryption=*)
 				PERSISTENT_ENCRYPTION="${ARGUMENT#*=}"
 				export PERSISTENT_ENCRYPTION

-- 
live-boot