X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Fgrml-live.conf;h=e30d4b7ba3755fc5e21e76784d3699be4f80eaf0;hp=a1aa84ac95c3324c734e3dda6ce4d03c2abc345e;hb=7beda7dae5063c45ab57c061bcfb27e13fd704ea;hpb=c9141f43791a61b6bce79fa3963791f96dd78f04

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index a1aa84a..e30d4b7 100644
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -13,7 +13,7 @@
 
 # Main output directory
 # Please notice that you need suid,dev,rw permissions there
-# OUTPUT="/grml/grml-live"
+# OUTPUT="./grml/"
 # You have enough RAM? Use shared memory for fast testing-purposes:
 # OUTPUT="/dev/shm" # mount -o remount,suid,dev,rw /dev/shm
 
@@ -23,6 +23,8 @@
 # BUILD_OUTPUT="$OUTPUT/grml_cd"
 # Where do you want to find the final ISO?
 # ISO_OUTPUT="$OUTPUT/grml_isos"
+# Where do you want to find the netboot package?
+# NETBOOT="${OUTPUT}/netboot/"
 
 # Do you want to preserve the logfile from being cleaned after each execution
 # of grml-live? By default the logfile is cleaned so the log doesn't fill up.
@@ -45,37 +47,34 @@
 # Default: unset (so do not remove the logfile(s))
 # ZERO_FAI_LOGFILE='1'
 
-# Which Debian suite to you want to use? Unless it is set it defaults to "squeeze"
-# Supported values are: etch, lenny, sid,
-#                       squeeze -> requires /etc/grml/fai/config/basefiles/....tar.gz
-#                                  or a recent version of debootstrap
-# SUITE="squeeze"
+# Which Debian suite/release do you want to use?
+# Supported values are: stable, testing, unstable (or their corresponding release
+# names like "jessie").
+# Unless it is set it defaults to "testing".
+# SUITE="unstable"
 
 # 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; make sure to also use a GRML_* class (for example GRML_SMALL,
-# GRML_MEDIUM or GRML_FULL) to get an according kernel and also select the
+# are doing; make sure to also use a GRML_* class (for example GRML_SMALL
+# or GRML_FULL) to get an according kernel and also select the
 # architecture (I386 for x86; AMD64 for x86_64)
-# CLASSES="GRMLBASE,GRML_MEDIUM,I386"
+# CLASSES="GRMLBASE,GRML_FULL,I386"
 
 # HTTP Proxy to use for APT
 # APT_PROXY="http://localhost:3142/"
 
 # Which Debian suite 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: "<suite> <mirror>"
-# FAI_DEBOOTSTRAP="squeeze http://cdn.debian.net/debian"
+# FAI_DEBOOTSTRAP="jessie http://ftp.debian.org/debian"
 
 # Do you want to use a local mirror (like NFS)?
 # If so specify the directory where debian/ is available:
-# MIRROR_DIRECTORY="/mnt/mirror"
+# MIRROR_DIRECTORY="/media/mirror"
 # ... and then set up an according class file in
 # ${GRML_FAI_CONFIG}/config/files/etc/apt/sources.list.d/
 # containing something like:
-# deb file:///mnt/mirror/debian sid main contrib non-free
+# deb file:///media/mirror/debian sid main contrib non-free
 
 # Version number of ISO:
 # VERSION="0.0-1"
@@ -134,6 +133,11 @@
 # likes the default directory [/usr/share/grml-live/templates]
 # TEMPLATE_DIRECTORY='/usr/share/grml-live/templates'
 
+# Use custom scripts, for example for bootgrub.mksh?
+# Useful when running grml-live from git checkout.
+# If unset defaults to /usr/share/grml-live/scripts
+# SCRIPTS_DIRECTORY='/usr/share/grml-live/scripts'
+
 # Do you want to use console based isolinux boot splash
 # instead of the default graphical menu?
 # ISOLINUX_METHOD="console"