Included a note about persistent-subtext (Helps: #536728).

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

diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 2e74e1b..c82d887 100644 (file)
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2010\-06\-08 2.0~a6 "Debian Live Project"
+.TH LIVE\-BOOT 7 2010\-09\-25 2.0.6 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Scripts
@@ -21,7 +21,7 @@ At boot time it will look for a (read\-only) media containing a "/live" director
 In addition, there are some more boot parameters to influence the behaviour, see below.
 
 .SS Configuration Files
-\fBlive\-boot\fR 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/).
+\fBlive\-boot\fR 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.d/), or on the live media (live/boot.conf, live/boot.d/).
 
 .SH OPTIONS
 \fBlive\-boot\fR currently features the following parameters.
@@ -64,6 +64,8 @@ Target <target-name>
   Lun 0 Path=<path-to-your-live-image.iso>,Type=fileio,IOMode=ro
   # If you want to boot multiple machines you might want to look at tuning some parameters like
   # Wthreads or MaxConnections
+.IP "\fBfromiso\fR=\fI/PATH/TO/IMAGE\fI" 4
+Allows to use a filesystem from within an iso image that's available on live-media.
 .IP "\fBignore_uuid\fR" 4
 Do not check that any UUID embedded in the initramfs matches the discovered medium. live\-boot may be told to generate a UUID by setting LIVE_GENERATE_UUID=1 when building the initramfs.
 .IP "\fBintegrity\-check\fR" 4
@@ -102,6 +104,8 @@ This parameter enables usage of local swap partitions.
 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\-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
@@ -134,16 +138,16 @@ This saves expensive writes and speeds up operations on volatile data such as we
 
 .SH FILES
 .IP "\fB/etc/live/boot.conf\fR" 4
-.IP "\fB/etc/live/boot.conf.d/\fR" 4
+.IP "\fB/etc/live/boot.d/\fR" 4
 .IP "\fBlive/boot.conf\fR" 4
-.IP "\fBlive/boot.conf.d/\fR" 4
+.IP "\fBlive/boot.d/\fR" 4
 
 .SH SEE ALSO
 \fIlive\-snapshot\fR(1)
 .PP
-\fIlive\-config\fR(7)
+\fIlive\-build\fR(7)
 .PP
-\fIlive\-helper\fR(7)
+\fIlive\-config\fR(7)
 
 .SH HOMEPAGE
 More information about live\-boot and the Debian Live project can be found on the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.