summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Loibl <andreas@andreas-loibl.de>2012-02-27 11:46:18 +0100
committerAndreas Loibl <andreas@andreas-loibl.de>2012-02-27 11:46:18 +0100
commitc3feae6430738b27c148f3fae0f894135847326c (patch)
treedb0aff0dda43c001bc367128267fd3ba1d62cb3c
parent04728efa2c791d2b98e9d4bf666d5578c459ac5a (diff)
downloadkanotix-c3feae6430738b27c148f3fae0f894135847326c.zip
kanotix-c3feae6430738b27c148f3fae0f894135847326c.tar.gz
disable http_proxy for chroot-hooks
-rwxr-xr-xconfig/chroot_local-hooks/04-cleanup1
-rwxr-xr-xconfig/chroot_local-hooks/fix-libgl-bpo-ia32.sh1
2 files changed, 2 insertions, 0 deletions
diff --git a/config/chroot_local-hooks/04-cleanup b/config/chroot_local-hooks/04-cleanup
index cb407a3..985bee0 100755
--- a/config/chroot_local-hooks/04-cleanup
+++ b/config/chroot_local-hooks/04-cleanup
@@ -1,4 +1,5 @@
#!/bin/sh
+export http_proxy=
#apt-get remove --yes --purge aptitude dselect nano vim-tiny libdiscover1 resolvconf
apt-get remove --yes --purge nano vim-tiny libdiscover1 resolvconf
/usr/sbin/remove-orphans || true
diff --git a/config/chroot_local-hooks/fix-libgl-bpo-ia32.sh b/config/chroot_local-hooks/fix-libgl-bpo-ia32.sh
index 3272895..b063677 100755
--- a/config/chroot_local-hooks/fix-libgl-bpo-ia32.sh
+++ b/config/chroot_local-hooks/fix-libgl-bpo-ia32.sh
@@ -1,5 +1,6 @@
#!/bin/sh
[ $(id -u) != 0 ] && exit
+export http_proxy=
dpkg -l libgl1-mesa-glx|grep -q bpo || exit 0
if [ -f /usr/lib32/libGL.so.1.2 ]; then
TMP=$(mktemp -d /tmp/libgl.XXXXXX)