projects
/
grml-live.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
4152229
)
Add APT_PROXY configuration variable
author
Christian Hofstaedtler
<ch@grml.org>
Fri, 25 Nov 2011 16:18:51 +0000
(17:18 +0100)
committer
Christian Hofstaedtler
<ch@grml.org>
Fri, 25 Nov 2011 16:18:51 +0000
(17:18 +0100)
docs/grml-live.txt
patch
|
blob
|
history
etc/grml/fai/config/hooks/updatebase.GRMLBASE
patch
|
blob
|
history
etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
patch
|
blob
|
history
etc/grml/grml-live.conf
patch
|
blob
|
history
diff --git
a/docs/grml-live.txt
b/docs/grml-live.txt
index
1aac189
..
7952172
100644
(file)
--- a/
docs/grml-live.txt
+++ b/
docs/grml-live.txt
@@
-928,6
+928,9
@@
taken as first entry in the generated sources.list so it's preferred over
non-local mirrors. Using a fallback mirror (via providing several mirrors in
GRML_LIVE_SOURCES as used by default) is a recommended setting.
non-local mirrors. Using a fallback mirror (via providing several mirrors in
GRML_LIVE_SOURCES as used by default) is a recommended setting.
+If you want to use a HTTP Proxy (like apt-cacher-ng), set APT_PROXY. Example:
+APT_PROXY="http://localhost:3142/"
+
[[add-additional-debian-packages]]
How do I add additional Debian package(s) to my CD/ISO?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[[add-additional-debian-packages]]
How do I add additional Debian package(s) to my CD/ISO?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@
-1008,25
+1011,20
@@
or if using /etc/grml/fai/config/basefiles/$CLASSNAME.tar.gz for:
Existing base.tgz can be found at http://daily.grml.org/
[[apt-cacher]]
Existing base.tgz can be found at http://daily.grml.org/
[[apt-cacher]]
-Set up apt-cacher
/ apt-cacher
-ng for use with grml-live
+Set up apt-cacher-ng for use with grml-live
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Make sure /etc/grml/grml-live.
conf provides according GRML_LIVE_SOURCES
and
+Make sure /etc/grml/grml-live.
local provides according APT_PROXY
and
FAI_DEBOOTSTRAP:
FAI_DEBOOTSTRAP:
- # cat /etc/grml/grml-live.
conf
+ # cat /etc/grml/grml-live.
local
[...]
[...]
- GRML_LIVE_SOURCES="
- deb http://localhost:3142/deb.grml.org grml-stable main
- deb http://localhost:3142/deb.grml.org grml-testing main
- deb http://localhost:3142/cdn.debian.net/debian squeeze main contrib non-free
- "
+ APT_PROXY="http://localhost:3142/"
[...]
FAI_DEBOOTSTRAP="squeeze http://localhost:3142/cdn.debian.net/debian squeeze main contrib non-free"
[...]
FAI_DEBOOTSTRAP="squeeze http://localhost:3142/cdn.debian.net/debian squeeze main contrib non-free"
-Make sure apt-cacher / apt-cacher-ng is running ('/etc/init.d/apt-cacher
-restart' or '/etc/init.d/apt-cacher-ng restart'). That's it. All downloaded
-files will be cached in /var/cache/apt-cacher/ or /var/cache/apt-cacher-ng then.
+Make sure apt-cacher-ng is running ('/etc/init.d/apt-cacher-ng restart').
+That's it. All downloaded files will be cached in /var/cache/apt-cacher-ng then.
[[approx]]
Set up approx for use with grml-live
[[approx]]
Set up approx for use with grml-live
diff --git
a/etc/grml/fai/config/hooks/updatebase.GRMLBASE
b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
index
f88f0fb
..
82a2fb9
100755
(executable)
--- a/
etc/grml/fai/config/hooks/updatebase.GRMLBASE
+++ b/
etc/grml/fai/config/hooks/updatebase.GRMLBASE
@@
-18,6
+18,12
@@
HOSTNAME=''
[ -n "$HOSTNAME" ] || HOSTNAME=grml
echo "$HOSTNAME" > $target/etc/hostname
[ -n "$HOSTNAME" ] || HOSTNAME=grml
echo "$HOSTNAME" > $target/etc/hostname
+if [ -n "$APT_PROXY" ] ; then
+ cat > $target/etc/apt/apt.conf.d/90grml-apt-proxy.conf <<EOF
+Acquire::http { Proxy "$APT_PROXY"; };
+EOF
+fi
+
if [ "$FAI_ACTION" = "softupdate" ] ; then
echo "Action $FAI_ACTION of FAI (hooks/updatebase.GRMLBASE) via grml-live running"
if [ "$FAI_ACTION" = "softupdate" ] ; then
echo "Action $FAI_ACTION of FAI (hooks/updatebase.GRMLBASE) via grml-live running"
diff --git
a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
index
9df6204
..
c053a9e
100755
(executable)
--- a/
etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/
etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@
-17,6
+17,8
@@
fi
echo "Creating ~/.zshrc"
touch $target/root/.zshrc
echo "Creating ~/.zshrc"
touch $target/root/.zshrc
+$ROOTCMD rm -f /etc/apt/apt.conf.d/90grml-apt-proxy.conf
+
if [ -x $target/usr/sbin/localepurge ] ; then
echo "Running localepurge"
$ROOTCMD localepurge
if [ -x $target/usr/sbin/localepurge ] ; then
echo "Running localepurge"
$ROOTCMD localepurge
diff --git
a/etc/grml/grml-live.conf
b/etc/grml/grml-live.conf
index
8cb21b4
..
63acc99
100644
(file)
--- a/
etc/grml/grml-live.conf
+++ b/
etc/grml/grml-live.conf
@@
-76,6
+76,9
@@
#deb http://cdn.debian.net/debian etch main contrib non-free
#"
#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
# 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