Implement -D option to set configuration directory; fai.conf: don't set variables...

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

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index 2586fd0..7f2ff72 100644 (file)
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -66,8 +66,8 @@
 # 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. But please do *not*
-# manually edit /etc/grml/fai/apt/sources.list but instead use $GRML_LIVE_SOURCES.
+# ${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
@@ -177,12 +177,6 @@
 # the mksquashfs option -ef:
 # SQUASHFS_EXCLUDES_FILE="/etc/grml/fai/squashfs-excludes"
 
-# Skip download of pageant, plink, pscp, psftp, putty and puttygen
-# using wget to store it inside $BUILD_OUTPUT/windows/?
-# NO_WINDOWS_BINARIES="1"
-# URL for downloading the windows files:
-# WINDOWS_BINARIES="http://the.earth.li/~sgtatham/putty/latest/x86/"
-
 # Do you want to exit grml-live if some packages were requested for installation
 # on fresh installs but are missing on the generated ISO finally?
 # By default the package list is sent to stdout but grml-live doesn't interrupt.