X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=manpages%2Fen%2Flive-boot.7;h=80edf70a8090d7fb3c2e3f5b13dec2d75228a504;hb=1190be85490f7ae893652f0c9dd7004c48b657ae;hp=0467a979cd7b2b1a70fa68af03de53822eac9d41;hpb=bf69a0b2bd314bab8144767cf16d67309180d84b;p=live-boot-grml.git

diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 0467a97..80edf70 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2010\-09\-25 3.0~a7 "Debian Live Project"
+.TH LIVE\-BOOT 7 2011\-01\-11 3.0~a14 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Scripts
@@ -98,12 +98,22 @@ This parameter disables the default disabling of filesystem checks in /etc/fstab
 disables the "persistent" feature, useful if the bootloader (like syslinux) has been installed with persistent enabled.
 .IP "\fBnoprompt\fR" 4
 Do not prompt to eject the CD or remove the USB flash drive on reboot.
+.IP "\fBnoprompt\fR=\fITYPE\fR" 4
+This tells live-boot not to prompt to eject the CD (when noprompt=cd) or remove the USB flash drive (when noprompt=usb) on reboot.
+.IP "\fBramdisk\-size\fR" 4
+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]" 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. 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.
+.IP "\fBpersistent\fR[={nofiles|cryptsetup}]" 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\-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\-subtext\fR=\fISUFFIX\fR" 4
+Add a suffix when searching for the image filenames or partition labels to use for the above mentioned persistent feature, the SUFFIX will be added after a dash (e.g.: "live-sn" would transform to "live-sn-SUFFIX"). This is handy to test multiple live-boot based live-systems with different persistent storage choices.
 .IP "{\fBpreseed/file\fR|\fBfile\fR}=\fIFILE\fR" 4
 A path to a file present on the rootfs could be used to preseed debconf database.
 .IP "\fBpackage/question\fR=\fIVALUE\fR" 4