[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 05dd30f7923913a060d7bef57b167386c988bc7c
Author: Tails developers <amnesia at boum.org>
Date:   Thu Nov 10 19:24:13 2011 +0100

    Adding persistent-read-only boot parameter.
    
    It currently only makes snapshots read-only. Support for overlays will
    be a bit more complicated to implement.

diff --git a/scripts/live b/scripts/live
index 688c0a7..970853c 100755
--- a/scripts/live
+++ b/scripts/live
@@ -262,6 +262,10 @@ Arguments ()
 				PERSISTENT_PATH="${ARGUMENT#persistent-path=}"
 				export PERSISTENT_PATH
 				;;
+			persistent-read-only)
+				PERSISTENT_READONLY="Yes"
+				export PERSISTENT_READONLY
+				;;
 
 			persistent-storage=*)
 				PERSISTENT_STORAGE="${ARGUMENT#persistent-storage=}"
@@ -1186,7 +1190,10 @@ try_snap ()
 		return 1
 	fi
 
-	echo "export ${snap_type}SNAP=${snap_relpath}:${snapdev}:${snapfile}" >> snapshot.conf # for resync on reboot/halt
+	if [ -z ${PERSISTENT_READONLY} ]
+	then
+		echo "export ${snap_type}SNAP=${snap_relpath}:${snapdev}:${snapfile}" >> snapshot.conf # for resync on reboot/halt
+	fi
 	return 0
 }
 

-- 
live-boot