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 659e22c..63acc99 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
@@ -76,6 +76,9 @@
 #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
@@ -105,9 +108,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 +173,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?