X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=docs%2Fgrml-live.txt;h=f7f2ab2892f91ef7e6f4e3255ba1158fbbd4ea5b;hp=29d17e8da833b9414adb99f5d5e0b77f9c4e0a33;hb=d7155c6540bee645b7064acc6dc22e2a5d87e0ad;hpb=a873b56316960a176e341d023428eefc7e76678a

diff --git a/docs/grml-live.txt b/docs/grml-live.txt
index 29d17e8..f7f2ab2 100644
--- 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.
@@ -348,9 +358,11 @@ commandline.
   /etc/grml/fai/fai.conf
 
 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.
+files and scripts for FAI/grml-live can be found. By default the configuration
+variables are FAI_CONFIG_SRC=file:///etc/grml/fai/config and
+FAI_CONFIGDIR=/etc/grml/fai/config - both pointing to 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
 
@@ -652,11 +664,11 @@ Instructions
 
   # grml stable repository:
     deb     http://deb.grml.org/ grml-stable  main
-    deb-src http://deb.grml.org/ grml-stable  main
+  # deb-src http://deb.grml.org/ grml-stable  main
 
   # grml testing/development repository:
     deb     http://deb.grml.org/ grml-testing main
-    deb-src http://deb.grml.org/ grml-testing main
+  # deb-src http://deb.grml.org/ grml-testing main
   EOF
 
   # adjust apt-pinning (only prefer squashfs stuff from grml):
@@ -747,7 +759,8 @@ description to <mika@grml.org>:
 
   # history | grep grml-live > /etc/grml/grml_live.cmdline
   # tar zcf grml_live_problem.tar.gz /etc/grml/grml-live.conf \
-            /etc/grml/grml-buildd.conf /var/log/fai /etc/grml/fai
+            /etc/grml/grml_live.cmdline /etc/grml/grml-buildd.conf \
+            /var/log/fai /etc/grml/fai
   -> finally mail grml_live_problem.tar.gz to <mika@grml.org>
 
 If you need help with grml-live or would like to see new features as part of
@@ -760,27 +773,27 @@ How much is the difference between LZMA and ZLIB compression?
 
 ISO size (bs = blocksize):
 
-[width="45%",cols="3,^2,^2,^2"]
+[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