summaryrefslogtreecommitdiffstats
path: root/etc/pbuilderrc
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@mapreri.org>2015-06-01 21:34:21 +0200
committerHolger Levsen <holger@layer-acht.org>2015-06-02 00:57:17 +0200
commit05b175ed308ab7b18aafaa88031aa0b5891fecd2 (patch)
tree01becafd15658a4dc48ade9662896b14e9e57aeb /etc/pbuilderrc
parent70f6c4d78706db46325f8108cdc28fc258fc3c7b (diff)
downloadjenkins.debian.net-05b175ed308ab7b18aafaa88031aa0b5891fecd2.tar.xz
pbuilder: now that we run jessie set USEDEVSHM to yes instead of explicit bind-mouning
Diffstat (limited to 'etc/pbuilderrc')
-rw-r--r--etc/pbuilderrc5
1 files changed, 3 insertions, 2 deletions
diff --git a/etc/pbuilderrc b/etc/pbuilderrc
index dc9b8853..4fd3f642 100644
--- a/etc/pbuilderrc
+++ b/etc/pbuilderrc
@@ -11,9 +11,8 @@ COMPRESSPROG="pigz"
# unset proxy, see #780587
unset http_proxy
export -n http_proxy
-# remove /run/shm bindmount once we are running jessie - this is a workaround for #700591
# /sys and /proc were added as workarounds for #773767
-BINDMOUNTS="$BINDMOUNTS /run/shm /dev/shm /sys"
+BINDMOUNTS="$BINDMOUNTS /sys"
# set PATH to predictable values, see #780729 and #780725
PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games"
# Use a different umask, but only do so when the UTS namespace differs from pid 1's UTS namespace.
@@ -22,3 +21,5 @@ PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games"
if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then
umask 0002
fi
+
+USEDEVSHM=yes