[Qa-jenkins-scm] [jenkins.debian.net] 01/02: pbuilder: now that we run jessie set USEDEVSHM to yes instead of explicit bind-mouning

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 05b175ed308ab7b18aafaa88031aa0b5891fecd2
Author: Mattia Rizzolo <mattia at mapreri.org>
Date:   Mon Jun 1 21:34:21 2015 +0200

    pbuilder: now that we run jessie set USEDEVSHM to yes instead of explicit bind-mouning
---
 TODO           | 1 -
 etc/pbuilderrc | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/TODO b/TODO
index 501ffef..2958bbf 100644
--- a/TODO
+++ b/TODO
@@ -87,7 +87,6 @@ The plan is to run a jenkins.d.o host, which is maintained by DSA, but we are ma
 * Apply the patch from https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=26;filename=pbuilder.patch;att=1;bug=677666 to the installed pbuilder package(s)
 ** also the other pbuilder patches
 * replace with bin/setsid.py workaround with setsid from the util-linux package from jessie
-* etc/pbuilderrc: remove /run/shm bindmount once we are running jessie - this is a workaround for #700591
 * bin/g-i-installation: use lvcreate without --virtualsize
 * check if the sudo workaround in bin/g-i-installation is still needed: 'guestmount -o uid=$(id -u) -o gid=$(id -g)' would be nicer, but it doesnt work: as root, the files seem to belong to jenkins, but as jenkins they cannot be accessed.
 * reproducible: let the scheduler use the xz-compressed file instead of the gzip one. This is because of missing lzma module in wheezy's python.
diff --git a/etc/pbuilderrc b/etc/pbuilderrc
index dc9b885..4fd3f64 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git