[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 4998047a5c817b7d36d95ff150ba056972fb0729
Author: Tails developers <amnesia at boum.org>
Date:   Mon Nov 21 11:12:47 2011 +0100

    Updating live-boot man page for persistent-encryption.

diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 68e9fe1..77a8126 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -106,12 +106,12 @@ This tells live-boot not to prompt to eject the CD (when noprompt=cd) or remove
 This parameters allows to set a custom ramdisk size (it's the '\-o size' option of tmpfs mount). By default, there is no ramdisk size set, so the default of mount applies (currently 50% of available RAM). Note that this option has no currently no effect when booting with toram.
 .IP "\fBswapon\fR" 4
 This parameter enables usage of local swap partitions.
-.IP "\fBpersistent\fR[={nofiles|cryptsetup}]" 4
+.IP "\fBpersistent\fR[=nofiles]" 4
 live\-boot will look for persistent and snapshot partitions or files labeled "live\-rw", "home\-rw", and files called "live\-sn*", "home\-sn*" and will try to, in order: mount as /cow the first, mount the second in /home, and just copy the contents of the latter in appropriate locations (snapshots). Snapshots will be tried to be updated on reboot/shutdown. Look at live\-snapshot(1) for more informations.
 .br
 If "nofiles" is specified, only filesystems with matching labels will be searched; no filesystems will be traversed looking for archives or image files. This results in shorter boot times.
-.br
-If "cryptsetup" is specified, filesystems stored on Luks\-encrypted devices will be considered as well as others when searching for a persistence filesystem; the user will be prompted for any needed decryption passphrase.
+.IP "\fBpersistent\-encryption\fR=\fITYPE1\fR,\fITYPE2\fR ... \fITYPEn\fR" 4
+This option determines which types of encryption that we allow to be used when probing devices for persistent media. If "none" is in the list, we allow unencrypted media; if "luks" is in the list, we allow LUKS\-encrypted media. Whenever a device containing encrypted media is probed the user will be prompted for the passphrase. The default value is "none".
 .IP "\fBpersistent\-media\fR={\fIremovable\fR|\fIremovable\-usb\fR}" 4
 If you specify the keyword 'removable', live\-boot will try to find persistent and snapshot partitions on removable media only. Note that if you want to further restrict the media to usb mass storage only, you can use the 'removable\-usb' keyword.
 .IP "\fBpersistent\-path\fR=\fIPATH\fR" 4

-- 
live-boot