X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=manpages%2Fde%2Flive-boot.de.7;h=5a8fb86fdabf3e0abd16e01113ce5f90a685011d;hb=9c9a90ef6364a1b6ada490a6f7fac67570778b47;hp=7bb396f1b294899b6e9685cf6f6122d3bc050c21;hpb=78fcd75edfc1f5eacb76e01eaffeeb1ca767b83c;p=live-boot-grml.git

diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 7bb396f..5a8fb86 100644
--- 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 01.09.2010 2.0.1 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 24.12.2010 2.0.14 "Debian Live Projekt"
 
 .SH NAME
 \fBlive\-boot\fP \- System Boot Skripte
@@ -38,8 +38,8 @@ see below.
 .SS Konfigurationsdateien
 \fBlive\-boot\fP can be configured (but not activated) through configuration
 files. Those files can be placed either in the root filesystem itself
-(/etc/live/boot.conf, /etc/live/boot.conf.d/), or on the live media
-(live/boot.conf, live/boot.conf.d/).
+(/etc/live/boot.conf, /etc/live/boot.d/), or on the live media
+(live/boot.conf, live/boot.d/).
 
 .SH OPTIONEN
 .\" FIXME
@@ -161,20 +161,31 @@ has been installed with persistent enabled.
 Do not prompt to eject the CD or remove the USB flash drive on reboot.
 .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.
@@ -236,16 +247,16 @@ directory with a tmpfs on the original path.
 
 .SH DATEIEN
 .IP \fB/etc/live/boot.conf\fP 4
-.IP \fB/etc/live/boot.conf.d/\fP 4
+.IP \fB/etc/live/boot.d/\fP 4
 .IP \fBlive/boot.conf\fP 4
-.IP \fBlive/boot.conf.d/\fP 4
+.IP \fBlive/boot.d/\fP 4
 
 .SH "SIEHE AUCH"
 \fIlive\-snapshot\fP(1)
 .PP
-\fIlive\-config\fP(7)
+\fIlive\-build\fP(7)
 .PP
-\fIlive\-helper\fP(7)
+\fIlive\-config\fP(7)
 
 .SH HOMEPAGE
 Weitere Informationen ueber live\-boot und das Debian Live Projekt koennen