X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Fgrml-live.conf;h=20ccfee7c02f14e7c8bae055b99354bbfe4bf550;hp=1d93c2096aaee9b6846b6ddc4ceefb3fc60dec6b;hb=85c10ba4c34c04a977ae4358e1506f2ecc819c34;hpb=d26c9850526c4d4d276f27a4b041ea7d73262ab8

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index 1d93c20..20ccfee 100644
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -3,7 +3,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Sun Dec 09 16:12:51 CET 2007 [mika]
 ################################################################################
 
 # Main output directory
@@ -31,8 +30,10 @@ ISO_OUTPUT="$OUTPUT/grml_isos"
 # 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 "etch"
+# Which Debian suite to you want to use? Unless it is set it defaults to "lenny"
 # 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?#
@@ -47,13 +48,14 @@ 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     etch         main contrib non-free
+#deb http://192.168.1.112/debian     lenny        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
@@ -64,7 +66,7 @@ CLASSES="GRMLBASE,GRML_MEDIUM,I386"
 # 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="etch http://ftp.de.debian.org/debian"
+# FAI_DEBOOTSTRAP="lenny http://ftp.de.debian.org/debian"
 
 # Do you want to use a local mirror (like NFS) as well?
 # If so specify the directory where debian/ is available:
@@ -113,6 +115,23 @@ 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'
+
+# By default the ISO is created for hybrid boot, so you can either
+# boot the CD using normal el torito mode or copy it to USB device
+# *without* having to run grml2usb (like: 'dd if=grml.iso of=/dev/sdX')
+# - working both with the same ISO
+# HYBRID_METHOD='disable'   # do not create a hybrid ISO
+# HYBRID_METHOD='isohybrid' # use isohybrid instead of the default (being manifold) 
+
+# exclude files from compressed squashfs file using the
+# the mksquashfs option -ef:
+# SQUASHFS_EXCLUDES_FILE="/etc/grml/fai/squashfs-excludes"
+
 # Do you want to download pageant, plink, pscp, psftp, putty and puttygen
 # using wget to store it inside $BUILD_OUTPUT/windows/?
 # Just unset it do skip download via wget or modify the download URL.