Do not fail in upgrade mode (-u) when configuration files have been modified

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

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index a5d0e50..84fe564 100644 (file)
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -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,11 +47,11 @@
 # 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 "wheezy").
+# Unless it is set it defaults to "testing".
+# SUITE="unstable"
 
 # Which FAI classes do you want to use by default?#
 
@@ -63,19 +65,16 @@
 # 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="wheezy http://http.debian.net/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"