X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Fgrml-live.conf;h=63acc99b32787954d453741c24a6e707efca806f;hb=005cdc1ea39899e025f302f05e16fb93bb66fee9;hp=d5b1fb0bfcc5994f96073cf1bc20afcc8fced97f;hpb=9d16d7a6c9686f80a18e70bc8b5e67193dc0ffba;p=grml-live.git diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf index d5b1fb0..63acc99 100644 --- 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 @@ -175,7 +178,7 @@ # exclude files from compressed squashfs file using the # the mksquashfs option -ef: -# SQUASHFS_EXCLUDES_FILE="/etc/grml/fai/squashfs-excludes" +# 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?