diff options
| author | Mattia Rizzolo <mattia@mapreri.org> | 2015-06-01 21:34:21 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-06-02 00:57:17 +0200 |
| commit | 05b175ed308ab7b18aafaa88031aa0b5891fecd2 (patch) | |
| tree | 01becafd15658a4dc48ade9662896b14e9e57aeb | |
| parent | 70f6c4d78706db46325f8108cdc28fc258fc3c7b (diff) | |
| download | jenkins.debian.net-05b175ed308ab7b18aafaa88031aa0b5891fecd2.tar.xz | |
pbuilder: now that we run jessie set USEDEVSHM to yes instead of explicit bind-mouning
| -rw-r--r-- | TODO | 1 | ||||
| -rw-r--r-- | etc/pbuilderrc | 5 |
2 files changed, 3 insertions, 3 deletions
@@ -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 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 |