X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Fgrml-live.conf;h=0ac6bb2402dda8419140958f025c416ebc8fbf6e;hp=a6b18b49baebf603ae30ada98ced817c7ffe47a3;hb=a9e75af584fbdf0137edf56db09aa87a3b18f1c5;hpb=2def18e419f1474c3904672ce297babbb4b9b501

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index a6b18b4..0ac6bb2 100644
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -31,7 +31,9 @@ ISO_OUTPUT="$OUTPUT/grml_isos"
 #ZERO_FAI_LOGFILE='1'
 
 # Which Debian suite to you want to use? Unless it is set it defaults to "lenny"
-# Supported values are: etch, lenny, squeeze, sid
+# Supported values are: etch, lenny, sid
+#                       squeeze -> requires /etc/grml/fai/config/basefiles/....tar.gz
+#                                  until supported by debootstrap
 # SUITE="sid"
 
 # Which FAI classes do you want to use by default?#
@@ -46,11 +48,12 @@ CLASSES="GRMLBASE,GRML_MEDIUM,I386"
 ## *FAI_DEBOOTSTRAP* accordingly. To use a local directory (like an NFS mount)
 ## check out MIRROR_DIRECTORY and MIRROR_SOURCES as well.
 
-# 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=...
+# Which Debian mirror do you want to use for main packages (after debootstrapping
+# has been finished)?
 # If you do *not* set GRML_LIVE_SOURCES here then grml-live will just take what
-# /etc/grml/fai/apt/sources.list provides by default.
-# Use the variable like your /etc/apt/sources.list looks like.
+# /etc/grml/fai/apt/sources.list provides by default. But please do *not*
+# manually edit /etc/grml/fai/apt/sources.list but instead use $GRML_LIVE_SOURCES.
+# Use the variable as your /etc/apt/sources.list looks like.
 #GRML_LIVE_SOURCES="
 #deb http://192.168.1.112/debian     lenny        main contrib non-free
 #deb http://deb.grml.org/            grml-stable  main
@@ -112,6 +115,12 @@ GRML_FAI_CONFIG=/etc/grml/fai
 # likes the default directory [/usr/share/grml-live/templates]
 # TEMPLATE_DIRECTORY='/usr/share/grml-live/templates'
 
+# Do you want to skip adding /boot/addons/ (from the template directory)?
+# NO_ADDONS='1'
+
+# Do you want to skip adding /boot/addons/bsd4grml/ (from the template directory)?
+# NO_ADDONS_BSD4GRML='1'
+
 # exclude files from compressed squashfs file using the
 # the mksquashfs option -ef:
 # SQUASHFS_EXCLUDES_FILE="/etc/grml/fai/squashfs-excludes"