Merge branch 'debian' of git://live.debian.net/git/live-boot into debian

[live-boot-grml.git] / manpages / de / live-boot.de.7

diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 213da9b..48fa818 100644 (file)
--- a/manpages/de/live-boot.de.7
+++ b/manpages/de/live-boot.de.7
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 14.09.2010 2.0.5 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 2011\-03\-14 3.0~a16 "Debian Live Projekt"
 
 .SH NAME
 \fBlive\-boot\fP \- System Boot Skripte
@@ -159,22 +159,41 @@ disables the "persistent" feature, useful if the bootloader (like syslinux)
 has been installed with persistent enabled.
 .IP \fBnoprompt\fP 4
 Do not prompt to eject the CD or remove the USB flash drive on reboot.
+.IP \fBnoprompt\fP=\fITYPE\fP 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\fP 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\fP 4
 This parameter enables usage of local swap partitions.
-.IP \fBpersistent\fP[=nofiles] 4
+.IP \fBpersistent\fP[={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. 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.
+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\fP=\fIPATH\fP 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\fP=\fISUFFIX\fP 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\fP|\fBfile\fP}=\fIFILE\fP 4
 A path to a file present on the rootfs could be used to preseed debconf
 database.
@@ -246,6 +265,8 @@ directory with a tmpfs on the original path.
 \fIlive\-build\fP(7)
 .PP
 \fIlive\-config\fP(7)
+.PP
+\fIlive\-tools\fP(7)
 
 .SH HOMEPAGE
 Weitere Informationen ueber live\-boot und das Debian Live Projekt koennen