X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=manpages%2Flive-initramfs.en.7.txt;h=f42a9ce75d6fa065fe8637885b128355277ec72c;hb=6fd3b2db8ca683513709560744aebd4cff3d378d;hp=c197abbf698da302aec668ab9f2ef6c302b9e313;hpb=aaef53af49f57c7feccb7ed2eb4297e730d0e7a6;p=live-boot-grml.git

diff --git a/manpages/live-initramfs.en.7.txt b/manpages/live-initramfs.en.7.txt
index c197abb..f42a9ce 100644
--- a/manpages/live-initramfs.en.7.txt
+++ b/manpages/live-initramfs.en.7.txt
@@ -21,7 +21,7 @@ This includes the Debian Live isos, netboot tarballs, and usb stick images.
 At boot time it will look for a (read-only) media containing a "/live"
 directory where a root filesystems (often a compressed filesystem image like
 squashfs) is stored. If found, it will create a writable environment, using
-unionfs, for Debian like systems to boot from.
+aufs, for Debian like systems to boot from.
 
 You probably do not want to install this package onto a non-live system,
 although it will do no harm.
@@ -60,6 +60,12 @@ copying to ram and booting it.
 
 Those parameters lets you override values read from the config file.
 
+  ignore_uuid
+
+Do not check that any UUID embedded in the initramfs matches the discovered
+medium. live-initramfs may be told to generate a UUID by setting
+LIVE_GENERATE_UUID=1 when building the initramfs.
+
   integrity-check::
 
 If specified, an MD5 sum is calculated on the live media during boot and
@@ -169,13 +175,17 @@ be checked at boot time, use this parameter, otherwise they are skipped.
 disables the "persistent" feature, useful if the bootloader (like syslinux) has
 been installed with persistent enabled.
 
+  noprompt
+
+Do not prompt to eject the CD on reboot.
+
   nosudo::
 
 This parameter disables the automatic configuration of sudo.
 
-  noswap::
+  swapon::
 
-This parameter disables usage of local swap partitions.
+This parameter enables usage of local swap partitions.
 
   nouser::
 
@@ -187,14 +197,16 @@ This parameter disables Xorg auto-reconfiguration at boot time. This is valuable
 if you either do the detection on your own, or, if you want to ship a custom,
 premade xorg.conf in your live system.
 
-  persistent::
+  persistent[=nofiles]::
 
 live-initramfs 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.
+informations. If "nofiles" is specified too, only labels will be searched and no
+filesystems will be mounted for searching file images or archives; this will
+results in improved boot times.
 
   {preseed/file|file}=**FILE**::
 
@@ -242,10 +254,10 @@ Adding this parameter, live-initramfs will try to copy the whole read-only media
 to the computer's RAM before mounting the root filesystem. This could need a lot
 of ram, according to the space used by the read-only media.
 
-  union=**unionfs**|**aufs**::
+  union=**aufs**|**unionfs**::
 
-By default, live-initramfs uses unionfs. With this parameter, you can switch to
-aufs.
+By default, live-initramfs uses aufs. With this parameter, you can switch to
+unionfs.
 
   utc=**yes**|**no**::
 
@@ -273,9 +285,9 @@ Some variables can be configured via this config file (inside the live system).
 This optional file (inside the live media) contains a list of white-space or
 carriage-return-separated file names corresponding to disk images in the "/live"
 directory. If this file exists, only images listed here will be merged into the
-root unionfs, and they will be loaded in the order listed here. The first entry
-in this file will be the "lowest" point in the unionfs, and the last file in
-this list will be on the "top" of the unionfs, directly below /cow.  Without
+root aufs, and they will be loaded in the order listed here. The first entry
+in this file will be the "lowest" point in the aufs, and the last file in
+this list will be on the "top" of the aufs, directly below /cow.  Without
 this file, any images in the "/live" directory are loaded in alphanumeric order.
 
 See also