Add APT_PROXY configuration variable

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

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index a954874..63acc99 100644 (file)
--- 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?#
 
@@ -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
@@ -76,12 +76,15 @@
 #deb http://cdn.debian.net/debian etch         main contrib non-free
 #"
 
+# 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?
 # If so specify the directory where debian/ is available:
@@ -105,11 +108,8 @@
 # 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
+# Supported values: isolinux, grub, grub2
 # BOOT_METHOD='isolinux'
 
 # Directory of configuration files for grml-live's FAI:
@@ -164,21 +164,21 @@
 # *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)
+# HYBRID_METHOD='isohybrid' # use isohybrid from SYSLINUX
+# HYBRID_METHOD='grub2'     # use manifold with GRUB 2
+# HYBRID_METHOD='manifold'  # use manifold with ISOLINUX (default)
 
 # Binary that should be used for creating the squashfs file.
-# Defaults to mksquashfs-lzma if available or falls back to mksquashfs.
+# Defaults to the executable matching the kernel version, falls back to mksquashfs.
 # SQUASHFS_BINARY='mksquashfs'
 
+# Options that should be used by mksquashfs during build process.
+# 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?
@@ -186,11 +186,16 @@
 # EXIT_ON_MISSING_PACKAGES=1
 
 # Do you want to use a special string for identifying the ISO?
-# By default the grml-name and version string are used as a base
-# for generating /conf/bootid.txt on the ISO. If you want to use
-# a different value feel free to adjust it accordingly.
-# Please notice that space characters inside the variable are
-# not supported.
+# By default the grml-name and version string are used as a base for generating
+# /conf/bootid.txt on the ISO. If you want to use a different value feel free to
+# adjust it accordingly.
+# Please notice that space characters inside this variable are not supported.
 # BOOTID="mybootid"
 
+# Do you want to skip the /conf/bootid.txt feature?
+# NO_BOOTID='1'
+
+# Do you want to add any additional bootoptions that should be used by default?
+# DEFAULT_BOOTOPTIONS="ssh=secret"
+
 ## END OF FILE #################################################################