summaryrefslogtreecommitdiffstats
path: root/hosts/odxu4c-armhf-rb/etc
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@debian.org>2016-08-14 09:56:21 +0000
committerHolger Levsen <holger@layer-acht.org>2016-08-14 13:42:01 +0200
commit8b3d602b786d3d7443da35859ec125baf510c546 (patch)
tree57687a0da1e900eb70a81b5650befec16d468b7e /hosts/odxu4c-armhf-rb/etc
parentca87bdd96611f50ed694d26474aec349ee634a28 (diff)
downloadjenkins.debian.net-8b3d602b786d3d7443da35859ec125baf510c546.tar.xz
pbuilder: stop unsetting http_proxy, pbuilder does it itself nowadays (see #780587)
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'hosts/odxu4c-armhf-rb/etc')
-rw-r--r--hosts/odxu4c-armhf-rb/etc/pbuilderrc4
1 files changed, 1 insertions, 3 deletions
diff --git a/hosts/odxu4c-armhf-rb/etc/pbuilderrc b/hosts/odxu4c-armhf-rb/etc/pbuilderrc
index 478804d3..a13ed5b3 100644
--- a/hosts/odxu4c-armhf-rb/etc/pbuilderrc
+++ b/hosts/odxu4c-armhf-rb/etc/pbuilderrc
@@ -23,9 +23,7 @@ EXTRAPACKAGES="" # better list them in bin/reproducible_setup_pbuilder.sh
APTCACHE=""
COMPRESSPROG="pigz"
BUILDPLACE=/srv/workspace/pbuilder # build in /srv/workspace, which is in tmpfs
-# unset proxy, see #780587
-unset http_proxy
-export -n http_proxy
+
# there are software wanting /dev/shm writable, so give them so. There are tons
# of bug shm related in pbuilder, that's just a workaround for all of them.
# /run/shm is already mounted as a tmpfs by default.