summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@mapreri.org>2015-06-19 11:44:27 +0000
committerHolger Levsen <holger@layer-acht.org>2015-06-19 13:55:14 +0200
commitf4748cb9e9f179011c8548adfce48a5737fe277e (patch)
treec94bc5be758a8f82ead1a4e8dde023669c3786a9
parent5cee0790a15245ef6e5ca89218c876c5533b0d59 (diff)
downloadjenkins.debian.net-f4748cb9e9f179011c8548adfce48a5737fe277e.tar.xz
bind-mount /dev/shm again, i misinterpreted a closed pbuilder bug. Now /run/shm is mounted by default, but no /dev/shm is available as tmpfs or symlink to /run/shm
-rw-r--r--etc/pbuilderrc7
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/pbuilderrc b/etc/pbuilderrc
index dc611e6a..6812ce26 100644
--- a/etc/pbuilderrc
+++ b/etc/pbuilderrc
@@ -12,12 +12,13 @@ COMPRESSPROG="pigz"
unset http_proxy
export -n http_proxy
# /sys and /proc were added as workarounds for #773767
-BINDMOUNTS="$BINDMOUNTS /sys"
+# 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.
+BINDMOUNTS="$BINDMOUNTS /sys /dev/shm"
# set PATH to predictable values, see #780729 and #780725
PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games"
-USEDEVSHM=yes
-
# used on reproducible builds
if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then
PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path"