[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 f495b818c3f0007b2a89771ba82767302e2c033f
Author: Tails developers <amnesia at boum.org>
Date:   Wed Nov 23 12:17:06 2011 +0100

    Updating live-boot man page for persistent-read-only.

diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 4cfcc94..6fe4df9 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -116,6 +116,8 @@ If you specify the keyword 'removable', live\-boot will try to find persistent a
 This option determines which types of persistent media we allow. If "overlay" is in the list, we consider overlays (i.e. "live\-rw" and "home\-rw"); if "snapshot" is in the list, we consider snapshots (i.e. "live\-sn" and "home\-sn"). The default is "overlay,snapshot".
 .IP "\fBpersistent\-path\fR=\fIPATH\fR" 4
 live\-boot will look for persistency files in the root directory of a partition, with this parameter, the path can be configured so that you can have multiple directories on the same partition to store persistency files.
+.IP "\fBpersistent\-read\-only\fR" 4
+Filesystem changes are not saved back to persistent media. In particular, overlays and netboot NFS mounts are mounted read-only, and snapshots are not resynced on shutdown.
 .IP "\fBpersistent\-storage\fR=\fITYPE1\fR,\fITYPE2\fR ... \fITYPEn\fR" 4
 This option determines which types of persistent storage to consider when probing for persistent media. If "filesystem" is in the list, filesystems with matching labels will be used; if "file" is in the list, all filesystems will be probed for archives and image files with matching filenames. The default is "file,filesystem".
 .IP "\fBpersistent\-subtext\fR=\fISUFFIX\fR" 4

-- 
live-boot