[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 a8b46858f239db00a07d1ff482eaff21e61e8b46
Author: Tails developers <amnesia at boum.org>
Date:   Tue Nov 8 20:44:11 2011 +0100

    Adding persistent-storage=TYPE...
    
    The comma-separated list TYPE... specifies which types of persistent
    storage to use. Current possible TYPEs are {file, filesystem}. For
    instance, persistent-storage=filesystem is equivalent to the old
    persistent=nofiles, but persistent-storage=file allows to look for
    only files, which wasn't possible before. The default is to look for
    both, i.e. persistent-storage=filesystem,file.

diff --git a/scripts/live b/scripts/live
index bd7d9c4..92e9d17 100755
--- a/scripts/live
+++ b/scripts/live
@@ -268,6 +268,11 @@ Arguments ()
 				export PERSISTENT_PATH
 				;;
 
+			persistent-storage=*)
+				PERSISTENT_STORAGE="${ARGUMENT#persistent-storage=}"
+				export PERSISTENT_STORAGE
+				;;
+
 			persistent-subtext=*)
 				root_persistence="${root_persistence}-${ARGUMENT#persistent-subtext=}"
 				home_persistence="${home_persistence}-${ARGUMENT#persistent-subtext=}"
@@ -390,6 +395,12 @@ Arguments ()
 		UNIONTYPE="aufs"
 		export UNIONTYPE
 	fi
+
+	if [ -n "${PERSISTENT}" ] && [ -z "${PERSISTENT_STORAGE}" ]
+	then
+		PERSISTENT_STORAGE="filesystem,file"
+		export PERSISTENT_STORAGE
+	fi
 }
 
 is_live_path ()
@@ -1054,13 +1065,13 @@ find_snap ()
 	black_listed_devices="${2}"
 	white_listed_devices="${3}"
 
-	if [ "${PERSISTENT}" != "nofiles" ]
+	if echo ${PERSISTENT_STORAGE} | grep -qw file
 	then
 		# search for image files
 		snapdata=$(find_files "${PERSISTENT_PATH}${snap_label}.squashfs ${PERSISTENT_PATH}${snap_label}.cpio.gz ${PERSISTENT_PATH}${snap_label}.ext2 ${PERSISTENT_PATH}${snap_label}.ext3 ${PERSISTENT_PATH}${snap_label}.ext4 ${PERSISTENT_PATH}${snap_label}.jffs2" "${black_listed_devices}" "${white_listed_devices}")
 	fi
 
-	if [ -z "${snapdata}" ]
+	if echo ${PERSISTENT_STORAGE} | grep -qw filesystem && [ -z "${snapdata}" ]
 	then
 		snapdata=$(find_cow_device "${snap_label}" "${black_listed_devices}" "${white_listed_devices}")
 	fi
diff --git a/scripts/live-helpers b/scripts/live-helpers
index 484ec93..f67e421 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -369,13 +369,13 @@ find_cow_device ()
 				done
 			fi
 
-			if [ "$(/sbin/blkid -s LABEL -o value $devname 2>/dev/null)" = "${pers_label}" ]
+			if echo ${PERSISTENT_STORAGE} | grep -qw filesystem && [ "$(/sbin/blkid -s LABEL -o value $devname 2>/dev/null)" = "${pers_label}" ]
 			then
 				echo "${devname}"
 				return 0
 			fi
 
-			if [ "${PERSISTENT}" = "nofiles" ]
+			if ! echo ${PERSISTENT_STORAGE} | grep -qw file
 			then
 				# do not mount the device to find for image files
 				# just skip this

-- 
live-boot