X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Fgrml-live.conf;h=ff6fbe0c8d7b057e9e3bc8de96510f186cb69b70;hp=63acc99b32787954d453741c24a6e707efca806f;hb=fcd3d3c959291bc4b88f3f26c0ec3347a826eb3d;hpb=005cdc1ea39899e025f302f05e16fb93bb66fee9

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index 63acc99..ff6fbe0 100644
--- 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.
@@ -57,24 +59,7 @@
 # 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
 # architecture (I386 for x86; AMD64 for x86_64)
-# CLASSES="GRMLBASE,GRML_MEDIUM,I386"
-
-## Which mirrors do you want to use? Please set GRML_LIVE_SOURCES *and*
-## *FAI_DEBOOTSTRAP* accordingly. To use a local directory (like an NFS mount)
-## check out MIRROR_DIRECTORY and MIRROR_SOURCES as well.
-
-# 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
-# ${GRML_FAI_CONFIG}/apt/sources.list provides by default. But please do *not*
-# manually edit ${GRML_FAI_CONFIG}/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://deb.grml.org/            grml-stable  main
-#deb http://deb.grml.org/            grml-testing main
-#deb http://192.168.1.112/debian     lenny     main contrib non-free
-#deb http://cdn.debian.net/debian etch         main contrib non-free
-#"
+# CLASSES="GRMLBASE,GRML_FULL,I386"
 
 # HTTP Proxy to use for APT
 # APT_PROXY="http://localhost:3142/"
@@ -86,11 +71,13 @@
 # Usage: "<suite> <mirror>"
 # FAI_DEBOOTSTRAP="squeeze http://cdn.debian.net/debian"
 
-# Do you want to use a local mirror (like NFS) as well?
+# Do you want to use a local mirror (like NFS)?
 # If so specify the directory where debian/ is available:
-# MIRROR_DIRECTORY="/mnt/mirror"
-# ... and the sources.list entry for the directory:
-# MIRROR_SOURCES="deb file:///mnt/mirror/debian sid main contrib non-free"
+# 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:///media/mirror/debian sid main contrib non-free
 
 # Version number of ISO:
 # VERSION="0.0-1"