Update docs to reflect current FAI_CONFIG_SRC setup.

[grml-live.git] / docs / grml-live.txt

diff --git a/docs/grml-live.txt b/docs/grml-live.txt
index c1da987..3d7d0f5 100644 (file)
--- a/docs/grml-live.txt
+++ b/docs/grml-live.txt
@@ -102,6 +102,16 @@ supported inside the scripts/hooks/classes at /etc/grml/fai/config. Instead use
 /etc/grml/grml-live.local for configuration stuff used inside
 /etc/grml/fai/config.
 
+  -d **DATE**::
+
+Use specified date as build date information on the ISO instead of the default.
+The default is the date when grml-live is being executed (retrieved via
+executing 'date +%Y-%m-%d'). The information is stored inside the file
+/GRML/grml-version on the ISO, /etc/grml_version in the squashfs file and in all
+the bootsplash related files. This option is useful if you want to provide an
+ISO with release information for a specific date but have to build it in
+advance. Usage example: '-d 2009-10-30'
+
   -F::
 
 Force execution and do not prompt for acknowledgment of configuration.
@@ -349,8 +359,9 @@ commandline.
 
 Main configuration file for FAI which specifies where all the configuration
 files and scripts for FAI/grml-live can be found. By default it is set to
-FAI_CONFIGDIR=/etc/grml/fai/config, a directory shipped by grml-live
-out-of-the-box so you shouldn't have to configure anything in this file.
+FAI_CONFIG_SRC=file:///etc/grml/fai/config being a directory shipped by
+grml-live out-of-the-box so you shouldn't have to configure anything in this
+file.
 
   /etc/grml/fai/make-fai-nfsroot.conf
 
@@ -527,14 +538,6 @@ ZLIB compression. Just use the defaults for enabling LZMA or use grml-live's
 * Kernel 2.6.28-grml[64]: does not work
 * Kernel 2.6.31-grml[64]: works
 
-////////////////////////////////////////////////////////////////////////////////
-[IMPORTANT]
-
-Do NOT use a blocksize different than the default (131072 / 128kb).  The kernel
-will very probably oops then - so please do not touch the '-b' option of
-mksquashfs.
-////////////////////////////////////////////////////////////////////////////////
-
 [NOTE]
 
 Please use squashfs-lzma-tools >=4.0-2 from Grml if you want to remaster any
@@ -768,27 +771,27 @@ How much is the difference between LZMA and ZLIB compression?
 
 ISO size (bs = blocksize):
 
-[width="45%",cols="3,^2,^2,^2",options="header"]
+[width="45%",cols="3,^2,^2"]
 |============================================================
-|ISO                   |LZMA (256kB bs) |LZMA (128kB bs)|ZLIB
-|grml_sid              |666M | WIP | 771M
-|grml_squeeze          |659M | WIP | 761M
-|grml_lenny            |624M | WIP | 723M
-|grml64_sid            |677M | WIP | 791M
-|grml64_squeeze        |671M | WIP | 785M
-|grml64_lenny          |639M | WIP | 745M
-|grml-medium_sid       |208M | WIP | 236M
-|grml-medium_squeeze   |206M | WIP | 234M
-|grml-medium_lenny     |193M | WIP | 220M
-|grml64-medium_sid     |213M | WIP | 245M
-|grml64-medium_squeeze |213M | WIP | 244M
-|grml64-medium_lenny   |201M | WIP | 231M
-|grml-small_sid        |102M | WIP | 118M
-|grml-small_squeeze    |101M | WIP | 117M
-|grml-small_lenny      |97M  | WIP | 112M
-|grml64-small_sid      |103M | WIP | 120M
-|grml64-small_squeeze  |103M | WIP | 120M
-|grml64-small_lenny    |99M  | WIP | 116M
+|ISO                   |LZMA (256kB bs) |ZLIB
+|grml_sid              |666M | 771M
+|grml_squeeze          |659M | 761M
+|grml_lenny            |624M | 723M
+|grml64_sid            |677M | 791M
+|grml64_squeeze        |671M | 785M
+|grml64_lenny          |639M | 745M
+|grml-medium_sid       |208M | 236M
+|grml-medium_squeeze   |206M | 234M
+|grml-medium_lenny     |193M | 220M
+|grml64-medium_sid     |213M | 245M
+|grml64-medium_squeeze |213M | 244M
+|grml64-medium_lenny   |201M | 231M
+|grml-small_sid        |102M | 118M
+|grml-small_squeeze    |101M | 117M
+|grml-small_lenny      |97M  | 112M
+|grml64-small_sid      |103M | 120M
+|grml64-small_squeeze  |103M | 120M
+|grml64-small_lenny    |99M  | 116M
 |============================================================
 
 Build time of grml-medium's squashfs file (depends on your system, though just
@@ -964,8 +967,7 @@ All downloaded files will be cached in /var/cache/approx now.
 I've a question which isn't answered by this document
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Don't hesitate to ask on IRC (channel #grml on irc.freenode.org) or just drop me
-a mail: <mika@grml.org>
+Don't hesitate to contact the author: <mika@grml.org>
 
 [[download]]
 Download / install grml-live as a Debian package