[Qa-jenkins-scm] [jenkins.debian.net] 01/02: sync with the others…

[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 12430e0818ea358d5a3883be0bf4e9852d743a93
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Jul 10 10:27:09 2016 +0200

    sync with the others…
---
 bin/reproducible_setup_pbuilder.sh                                    | 2 +-
 .../jenkins-test-vm/etc/pbuilder/rebuild-hooks/D01_modify_environment | 4 +++-
 hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment       | 4 +++-
 .../etc/pbuilder/rebuild-hooks/D01_modify_environment                 | 4 +++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/bin/reproducible_setup_pbuilder.sh b/bin/reproducible_setup_pbuilder.sh
index 848f481..b1b80c0 100755
--- a/bin/reproducible_setup_pbuilder.sh
+++ b/bin/reproducible_setup_pbuilder.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2014-2015 Holger Levsen <holger at layer-acht.org>
+# Copyright 2014-2016 Holger Levsen <holger at layer-acht.org>
 # released under the GPLv=2
 
 DEBUG=false
diff --git a/hosts/jenkins-test-vm/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/jenkins-test-vm/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 5e44255..62ae3d0 100755
--- a/hosts/jenkins-test-vm/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/jenkins-test-vm/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -2,6 +2,8 @@
 
 set -e
 
+BUILDDIR="${BUILDDIR:-/tmp/buildd}"
+
 # exit if we are in the same UTS namespace as init ( != 2nd build )
 [ "$(readlink /proc/1/ns/uts)" = "$(readlink /proc/self/ns/uts)" ] && exit 0
 
@@ -21,7 +23,7 @@ exit 0
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
-	echo -n "Moving "$BUILDDIR" to /tmp/disorderfs and mounting this as "$BUILDDIR" via the fuse disorderfs…"
+	echo -n "Moving $BUILDDIR to /tmp/disorderfs and mounting this as $BUILDDIR via the fuse disorderfs…"
 	mknod -m 666 /dev/fuse c 10 229
 	mv "$BUILDDIR" /tmp/disorderfs
 	mkdir "$BUILDDIR"
diff --git a/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 5e44255..62ae3d0 100755
--- a/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -2,6 +2,8 @@
 
 set -e
 
+BUILDDIR="${BUILDDIR:-/tmp/buildd}"
+
 # exit if we are in the same UTS namespace as init ( != 2nd build )
 [ "$(readlink /proc/1/ns/uts)" = "$(readlink /proc/self/ns/uts)" ] && exit 0
 
@@ -21,7 +23,7 @@ exit 0
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
-	echo -n "Moving "$BUILDDIR" to /tmp/disorderfs and mounting this as "$BUILDDIR" via the fuse disorderfs…"
+	echo -n "Moving $BUILDDIR to /tmp/disorderfs and mounting this as $BUILDDIR via the fuse disorderfs…"
 	mknod -m 666 /dev/fuse c 10 229
 	mv "$BUILDDIR" /tmp/disorderfs
 	mkdir "$BUILDDIR"
diff --git a/hosts/profitbricks-build10-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/profitbricks-build10-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 5e44255..62ae3d0 100755
--- a/hosts/profitbricks-build10-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/profitbricks-build10-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -2,6 +2,8 @@
 
 set -e
 
+BUILDDIR="${BUILDDIR:-/tmp/buildd}"
+
 # exit if we are in the same UTS namespace as init ( != 2nd build )
 [ "$(readlink /proc/1/ns/uts)" = "$(readlink /proc/self/ns/uts)" ] && exit 0
 
@@ -21,7 +23,7 @@ exit 0
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
-	echo -n "Moving "$BUILDDIR" to /tmp/disorderfs and mounting this as "$BUILDDIR" via the fuse disorderfs…"
+	echo -n "Moving $BUILDDIR to /tmp/disorderfs and mounting this as $BUILDDIR via the fuse disorderfs…"
 	mknod -m 666 /dev/fuse c 10 229
 	mv "$BUILDDIR" /tmp/disorderfs
 	mkdir "$BUILDDIR"

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