X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Fgrml-live.conf;h=a5d0e50e010484fc9f94098afd36d779a4305c5f;hp=30b508ca0d43ce11231da90c973726e018e9d654;hb=220ee724598d82ded6a43144f0c10e7cb927abeb;hpb=7741716c921420a1c8d8d63e9eadf0c80a3b3b51

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index 30b508c..a5d0e50 100644
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -45,11 +45,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 "lenny"
-# Supported values are: etch, lenny, sid
+# 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="lenny"
+# SUITE="squeeze"
 
 # Which FAI classes do you want to use by default?#
 
@@ -57,37 +57,25 @@
 # 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
-# /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://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/"
 
 # 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="lenny http://cdn.debian.net/debian"
+# 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"
+# ... 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
 
 # Version number of ISO:
 # VERSION="0.0-1"
@@ -105,9 +93,6 @@
 # Specify user with UID 1000 on live-system:
 # USERNAME=grml
 
-# Specify options for Squashfs build stage (running mksquashfs):
-# SQUASHFS_OPTIONS="-nolzma"
-
 # Which bootloader do you want to use? Default: isolinux
 # Supported values: isolinux, grub, grub2
 # BOOT_METHOD='isolinux'
@@ -173,18 +158,12 @@
 # SQUASHFS_BINARY='mksquashfs'
 
 # Options that should be used by mksquashfs during build process.
-# Defaults to '-b 256k' and the according LZMA option.
+# Defaults to '-b 256k' and the according LZMA/XZ option.
 # SQUASHFS_OPTIONS='-b 256k'
 
 # exclude files from compressed squashfs file using the
 # 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/"
+# SQUASHFS_EXCLUDES_FILE="${GRML_FAI_CONFIG}/config/grml/squashfs-excludes"
 
 # 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?