Depend on fai >=3.2, implement the suite handling for conffiles, update docs, improve...

[grml-live.git] / etc / grml / grml-live.conf

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index a71391b..1c776e6 100644 (file)
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -18,20 +18,37 @@ BUILD_TARGET="$TARGET/grml_cd"
 # where do you want to find the final ISO?
 ISO_TARGET="$TARGET/grml_isos"
 
-# which architecture want to build for now?
-# defaults to output of 'dpkg --print-architecture'
-# ARCH="i386"
-
-# which Debian suite to you want to use?
-# unless set it defaults to "etch"
-# support values: stable, testing, unstable, etch, lenny, sid
+# which Debian suite to you want to use? unless set it defaults to "etch"
+# supported values: stable, testing, unstable, etch, lenny, sid
 # SUITE="sid"
 
 # which FAI classes do you want to use by default?
-# notice: GRMLBASE is recommended in any case unless you
-# *really* know what you are doing
+# notice: GRMLBASE is recommended in any case unless you *really*
+# know what you are doing; class I386 provides the kernel
 CLASSES="GRMLBASE,I386"
 
+## Which mirrors do you want to use? Please set GRML_LIVE_SOURCES *and*
+## *FAI_DEBOOTSTRAP* according!
+
+# Do you want to generate /etc/grml/fai/apt/sources.list on-the-fly via grml-live?
+# If so then activate the according mirrors using GRML_LIVE_SOURCES=...
+# If you do *not* set GRML_LIVE_SOURCES then grml-live will just take what
+# /etc/grml/fai/apt/sources.list provides by default
+# Usage: like your /etc/apt/sources.list looks like
+#GRML_LIVE_SOURCES="
+#deb http://192.168.1.112/debian     etch         main contrib non-free
+#deb http://deb.grml.org/            grml-stable  main
+#deb http://deb.grml.org/            grml-testing main
+#deb http://ftp.de.debian.org/debian etch         main contrib non-free
+#"
+
+# Which Debian flavour and which mirror do you want to use for basic debootstrapping?
+# Unless specified the default from /etc/grml/fai/make-fai-nfsroot.conf will be
+# taken. If you specify a value then the file /etc/grml/fai/make-fai-nfsroot.conf
+# will be updated by grml-live on-the-fly.
+# Usage: <flavour> <mirror>
+# FAI_DEBOOTSTRAP="etch http://ftp.de.debian.org/debian"
+
 # directory of configuration files for grml-live's FAI:
 GRML_FAI_CONFIG=/etc/grml/fai
 
@@ -42,24 +59,11 @@ HOSTNAME=grml
 USERNAME=grml
 
 # do you want to pass any additional arguments to FAI?
-FAI_ARGS=""
-
-# do you want to generate /etc/grml/fai/apt/sources.list on-the-fly via grml-live?
-# otherwise just take what /etc/grml/fai/apt/sources.list provides by default
-# GRML_LIVE_SOURCES has to look like a usual /etc/apt/sources.list entry
-#GRML_LIVE_SOURCES="
-#deb http://192.168.1.112/debian     etch         main contrib non-free
-#deb http://deb.grml.org/            grml-stable  main
-#deb http://deb.grml.org/            grml-testing main
-#deb http://ftp.de.debian.org/debian etch         main contrib non-free
-#"
+# FAI_ARGS=""
 
-# Which Debian flavour and which mirror do you want to use for debootstrapping?
-# Unless specified the default from /etc/grml/fai/make-fai-nfsroot.conf will be
-# taken. If you specify a value then the file
-# /etc/grml/fai/make-fai-nfsroot.conf will be updated by grml-live on-the-fly.
-# usage: <flavour> <mirror>
-# FAI_DEBOOTSTRAP="etch http://ftp.de.debian.org/debian"
+# which architecture do you want to build?
+# defaults to output of 'dpkg --print-architecture'
+# ARCH="i386"
 
 # do you want to download pageant, plink, pscp, psftp, putty and puttygen
 # to store it inside $BUILD_TARGET/windows/?