reproducible pbuilder hooks: use BUILDDIR, to comply with pbuilder 0.216

30 files changed, 154 insertions, 100 deletions

diff --git a/hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup b/hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
index c60a991c..bbea69fa 100755
--- a/hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
+++ b/hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
@@ -2,14 +2,16 @@
 
 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
 
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
 	echo -n "Unmounting /tmp/disorderfs…"
-	fusermount -u /tmp/buildd
-	rmdir /tmp/buildd
-	mv /tmp/disorderfs /tmp/buildd
+	fusermount -u "$BUILDDIR"
+	rmdir "$BUILDDIR"
+	mv /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 fi
diff --git a/hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup b/hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
index 6ec09822..73f4083c 100755
--- a/hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
+++ b/hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
@@ -2,6 +2,8 @@
 
 set -e
 
+BUILDDIR="${BUILDDIR:-/tmp/buildd}"
+
 echo "debug output: disk usage on $(hostname) at $(date -u)"
 df -h
 echo
@@ -12,8 +14,8 @@ echo
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
 	echo -n "Unmounting /tmp/disorderfs…"
-	fusermount -u /tmp/buildd
-	rmdir /tmp/buildd
-	mv /tmp/disorderfs /tmp/buildd
+	fusermount -u "$BUILDDIR"
+	rmdir "$BUILDDIR"
+	mv /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 fi
diff --git a/hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 52862f16..dda76947 100755
--- a/hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/bpi0-armhf-rb/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
 
@@ -17,11 +19,11 @@ exit 0
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
-	echo -n "Moving /tmp/buildd to /tmp/disorderfs and mounting this as /tmp/buildd 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 /tmp/buildd /tmp/disorderfs
-	mkdir /tmp/buildd
-	disorderfs --multi-user=yes /tmp/disorderfs /tmp/buildd
+	mv "$BUILDDIR" /tmp/disorderfs
+	mkdir "$BUILDDIR"
+	disorderfs --multi-user=yes /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 else
 	echo "Warning: disorderfs not available."
diff --git a/hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup b/hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
index c60a991c..bbea69fa 100755
--- a/hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
+++ b/hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
@@ -2,14 +2,16 @@
 
 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
 
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
 	echo -n "Unmounting /tmp/disorderfs…"
-	fusermount -u /tmp/buildd
-	rmdir /tmp/buildd
-	mv /tmp/disorderfs /tmp/buildd
+	fusermount -u "$BUILDDIR"
+	rmdir "$BUILDDIR"
+	mv /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 fi
diff --git a/hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup b/hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
index 6ec09822..73f4083c 100755
--- a/hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
+++ b/hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
@@ -2,6 +2,8 @@
 
 set -e
 
+BUILDDIR="${BUILDDIR:-/tmp/buildd}"
+
 echo "debug output: disk usage on $(hostname) at $(date -u)"
 df -h
 echo
@@ -12,8 +14,8 @@ echo
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
 	echo -n "Unmounting /tmp/disorderfs…"
-	fusermount -u /tmp/buildd
-	rmdir /tmp/buildd
-	mv /tmp/disorderfs /tmp/buildd
+	fusermount -u "$BUILDDIR"
+	rmdir "$BUILDDIR"
+	mv /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 fi
diff --git a/hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 52862f16..dda76947 100755
--- a/hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/cbxi4pro0-armhf-rb/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
 
@@ -17,11 +19,11 @@ exit 0
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
-	echo -n "Moving /tmp/buildd to /tmp/disorderfs and mounting this as /tmp/buildd 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 /tmp/buildd /tmp/disorderfs
-	mkdir /tmp/buildd
-	disorderfs --multi-user=yes /tmp/disorderfs /tmp/buildd
+	mv "$BUILDDIR" /tmp/disorderfs
+	mkdir "$BUILDDIR"
+	disorderfs --multi-user=yes /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 else
 	echo "Warning: disorderfs not available."
diff --git a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup b/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
index c60a991c..bbea69fa 100755
--- a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
+++ b/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
@@ -2,14 +2,16 @@
 
 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
 
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
 	echo -n "Unmounting /tmp/disorderfs…"
-	fusermount -u /tmp/buildd
-	rmdir /tmp/buildd
-	mv /tmp/disorderfs /tmp/buildd
+	fusermount -u "$BUILDDIR"
+	rmdir "$BUILDDIR"
+	mv /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 fi
diff --git a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup b/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
index 6ec09822..73f4083c 100755
--- a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
+++ b/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
@@ -2,6 +2,8 @@
 
 set -e
 
+BUILDDIR="${BUILDDIR:-/tmp/buildd}"
+
 echo "debug output: disk usage on $(hostname) at $(date -u)"
 df -h
 echo
@@ -12,8 +14,8 @@ echo
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
 	echo -n "Unmounting /tmp/disorderfs…"
-	fusermount -u /tmp/buildd
-	rmdir /tmp/buildd
-	mv /tmp/disorderfs /tmp/buildd
+	fusermount -u "$BUILDDIR"
+	rmdir "$BUILDDIR"
+	mv /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 fi
diff --git a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 52862f16..dda76947 100755
--- a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/hb0-armhf-rb/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
 
@@ -17,11 +19,11 @@ exit 0
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
-	echo -n "Moving /tmp/buildd to /tmp/disorderfs and mounting this as /tmp/buildd 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 /tmp/buildd /tmp/disorderfs
-	mkdir /tmp/buildd
-	disorderfs --multi-user=yes /tmp/disorderfs /tmp/buildd
+	mv "$BUILDDIR" /tmp/disorderfs
+	mkdir "$BUILDDIR"
+	disorderfs --multi-user=yes /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 else
 	echo "Warning: disorderfs not available."
diff --git a/hosts/jenkins/etc/pbuilder/rebuild-hooks/B01_cleanup b/hosts/jenkins/etc/pbuilder/rebuild-hooks/B01_cleanup
index c60a991c..601d4b1d 100755
--- a/hosts/jenkins/etc/pbuilder/rebuild-hooks/B01_cleanup
+++ b/hosts/jenkins/etc/pbuilder/rebuild-hooks/B01_cleanup
@@ -8,8 +8,8 @@ set -e
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
 	echo -n "Unmounting /tmp/disorderfs…"
-	fusermount -u /tmp/buildd
-	rmdir /tmp/buildd
-	mv /tmp/disorderfs /tmp/buildd
+	fusermount -u "$BUILDDIR"
+	rmdir "$BUILDDIR"
+	mv /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 fi
diff --git a/hosts/jenkins/etc/pbuilder/rebuild-hooks/C01_cleanup b/hosts/jenkins/etc/pbuilder/rebuild-hooks/C01_cleanup
index 6ec09822..7552e993 100755
--- a/hosts/jenkins/etc/pbuilder/rebuild-hooks/C01_cleanup
+++ b/hosts/jenkins/etc/pbuilder/rebuild-hooks/C01_cleanup
@@ -12,8 +12,8 @@ echo
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
 	echo -n "Unmounting /tmp/disorderfs…"
-	fusermount -u /tmp/buildd
-	rmdir /tmp/buildd
-	mv /tmp/disorderfs /tmp/buildd
+	fusermount -u "$BUILDDIR"
+	rmdir "$BUILDDIR"
+	mv /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 fi
diff --git a/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 52862f16..318390c5 100755
--- a/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,11 +17,11 @@ exit 0
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
-	echo -n "Moving /tmp/buildd to /tmp/disorderfs and mounting this as /tmp/buildd 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 /tmp/buildd /tmp/disorderfs
-	mkdir /tmp/buildd
-	disorderfs --multi-user=yes /tmp/disorderfs /tmp/buildd
+	mv "$BUILDDIR" /tmp/disorderfs
+	mkdir "$BUILDDIR"
+	disorderfs --multi-user=yes /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 else
 	echo "Warning: disorderfs not available."
diff --git a/hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup b/hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup
index c60a991c..bbea69fa 100755
--- a/hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup
+++ b/hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup
@@ -2,14 +2,16 @@
 
 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
 
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
 	echo -n "Unmounting /tmp/disorderfs…"
-	fusermount -u /tmp/buildd
-	rmdir /tmp/buildd
-	mv /tmp/disorderfs /tmp/buildd
+	fusermount -u "$BUILDDIR"
+	rmdir "$BUILDDIR"
+	mv /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 fi
diff --git a/hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup b/hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup
index 6ec09822..73f4083c 100755
--- a/hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup
+++ b/hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup
@@ -2,6 +2,8 @@
 
 set -e
 
+BUILDDIR="${BUILDDIR:-/tmp/buildd}"
+
 echo "debug output: disk usage on $(hostname) at $(date -u)"
 df -h
 echo
@@ -12,8 +14,8 @@ echo
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
 	echo -n "Unmounting /tmp/disorderfs…"
-	fusermount -u /tmp/buildd
-	rmdir /tmp/buildd
-	mv /tmp/disorderfs /tmp/buildd
+	fusermount -u "$BUILDDIR"
+	rmdir "$BUILDDIR"
+	mv /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 fi
diff --git a/hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 52862f16..dda76947 100755
--- a/hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/profitbricks-build1-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
 
@@ -17,11 +19,11 @@ exit 0
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
-	echo -n "Moving /tmp/buildd to /tmp/disorderfs and mounting this as /tmp/buildd 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 /tmp/buildd /tmp/disorderfs
-	mkdir /tmp/buildd
-	disorderfs --multi-user=yes /tmp/disorderfs /tmp/buildd
+	mv "$BUILDDIR" /tmp/disorderfs
+	mkdir "$BUILDDIR"
+	disorderfs --multi-user=yes /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 else
 	echo "Warning: disorderfs not available."
diff --git a/hosts/profitbricks-build2-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup b/hosts/profitbricks-build2-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup
index c60a991c..bbea69fa 100755
--- a/hosts/profitbricks-build2-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup
+++ b/hosts/profitbricks-build2-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup
@@ -2,14 +2,16 @@
 
 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
 
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
 	echo -n "Unmounting /tmp/disorderfs…"
-	fusermount -u /tmp/buildd
-	rmdir /tmp/buildd
-	mv /tmp/disorderfs /tmp/buildd
+	fusermount -u "$BUILDDIR"
+	rmdir "$BUILDDIR"
+	mv /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 fi
diff --git a/hosts/profitbricks-build2-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup b/hosts/profitbricks-build2-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup
index 6ec09822..73f4083c 100755
--- a/hosts/profitbricks-build2-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup
+++ b/hosts/profitbricks-build2-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup
@@ -2,6 +2,8 @@
 
 set -e
 
+BUILDDIR="${BUILDDIR:-/tmp/buildd}"
+
 echo "debug output: disk usage on $(hostname) at $(date -u)"
 df -h
 echo
@@ -12,8 +14,8 @@ echo
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
 	echo -n "Unmounting /tmp/disorderfs…"
-	fusermount -u /tmp/buildd
-	rmdir /tmp/buildd
-	mv /tmp/disorderfs /tmp/buildd
+	fusermount -u "$BUILDDIR"
+	rmdir "$BUILDDIR"
+	mv /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 fi
diff --git a/hosts/profitbricks-build2-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/profitbricks-build2-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 52862f16..dda76947 100755
--- a/hosts/profitbricks-build2-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/profitbricks-build2-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
 
@@ -17,11 +19,11 @@ exit 0
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
-	echo -n "Moving /tmp/buildd to /tmp/disorderfs and mounting this as /tmp/buildd 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 /tmp/buildd /tmp/disorderfs
-	mkdir /tmp/buildd
-	disorderfs --multi-user=yes /tmp/disorderfs /tmp/buildd
+	mv "$BUILDDIR" /tmp/disorderfs
+	mkdir "$BUILDDIR"
+	disorderfs --multi-user=yes /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 else
 	echo "Warning: disorderfs not available."
diff --git a/hosts/profitbricks-build4-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup b/hosts/profitbricks-build4-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup
index c60a991c..bbea69fa 100755
--- a/hosts/profitbricks-build4-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup
+++ b/hosts/profitbricks-build4-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup
@@ -2,14 +2,16 @@
 
 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
 
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
 	echo -n "Unmounting /tmp/disorderfs…"
-	fusermount -u /tmp/buildd
-	rmdir /tmp/buildd
-	mv /tmp/disorderfs /tmp/buildd
+	fusermount -u "$BUILDDIR"
+	rmdir "$BUILDDIR"
+	mv /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 fi
diff --git a/hosts/profitbricks-build4-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup b/hosts/profitbricks-build4-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup
index 6ec09822..73f4083c 100755
--- a/hosts/profitbricks-build4-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup
+++ b/hosts/profitbricks-build4-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup
@@ -2,6 +2,8 @@
 
 set -e
 
+BUILDDIR="${BUILDDIR:-/tmp/buildd}"
+
 echo "debug output: disk usage on $(hostname) at $(date -u)"
 df -h
 echo
@@ -12,8 +14,8 @@ echo
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
 	echo -n "Unmounting /tmp/disorderfs…"
-	fusermount -u /tmp/buildd
-	rmdir /tmp/buildd
-	mv /tmp/disorderfs /tmp/buildd
+	fusermount -u "$BUILDDIR"
+	rmdir "$BUILDDIR"
+	mv /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 fi
diff --git a/hosts/profitbricks-build4-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/profitbricks-build4-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 52862f16..dda76947 100755
--- a/hosts/profitbricks-build4-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/profitbricks-build4-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
 
@@ -17,11 +19,11 @@ exit 0
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
-	echo -n "Moving /tmp/buildd to /tmp/disorderfs and mounting this as /tmp/buildd 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 /tmp/buildd /tmp/disorderfs
-	mkdir /tmp/buildd
-	disorderfs --multi-user=yes /tmp/disorderfs /tmp/buildd
+	mv "$BUILDDIR" /tmp/disorderfs
+	mkdir "$BUILDDIR"
+	disorderfs --multi-user=yes /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 else
 	echo "Warning: disorderfs not available."
diff --git a/hosts/profitbricks-build5-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup b/hosts/profitbricks-build5-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup
index c60a991c..bbea69fa 100755
--- a/hosts/profitbricks-build5-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup
+++ b/hosts/profitbricks-build5-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup
@@ -2,14 +2,16 @@
 
 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
 
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
 	echo -n "Unmounting /tmp/disorderfs…"
-	fusermount -u /tmp/buildd
-	rmdir /tmp/buildd
-	mv /tmp/disorderfs /tmp/buildd
+	fusermount -u "$BUILDDIR"
+	rmdir "$BUILDDIR"
+	mv /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 fi
diff --git a/hosts/profitbricks-build5-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup b/hosts/profitbricks-build5-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup
index 6ec09822..73f4083c 100755
--- a/hosts/profitbricks-build5-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup
+++ b/hosts/profitbricks-build5-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup
@@ -2,6 +2,8 @@
 
 set -e
 
+BUILDDIR="${BUILDDIR:-/tmp/buildd}"
+
 echo "debug output: disk usage on $(hostname) at $(date -u)"
 df -h
 echo
@@ -12,8 +14,8 @@ echo
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
 	echo -n "Unmounting /tmp/disorderfs…"
-	fusermount -u /tmp/buildd
-	rmdir /tmp/buildd
-	mv /tmp/disorderfs /tmp/buildd
+	fusermount -u "$BUILDDIR"
+	rmdir "$BUILDDIR"
+	mv /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 fi
diff --git a/hosts/profitbricks-build5-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/profitbricks-build5-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 52862f16..dda76947 100755
--- a/hosts/profitbricks-build5-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/profitbricks-build5-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
 
@@ -17,11 +19,11 @@ exit 0
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
-	echo -n "Moving /tmp/buildd to /tmp/disorderfs and mounting this as /tmp/buildd 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 /tmp/buildd /tmp/disorderfs
-	mkdir /tmp/buildd
-	disorderfs --multi-user=yes /tmp/disorderfs /tmp/buildd
+	mv "$BUILDDIR" /tmp/disorderfs
+	mkdir "$BUILDDIR"
+	disorderfs --multi-user=yes /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 else
 	echo "Warning: disorderfs not available."
diff --git a/hosts/profitbricks-build6-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup b/hosts/profitbricks-build6-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup
index c60a991c..bbea69fa 100755
--- a/hosts/profitbricks-build6-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup
+++ b/hosts/profitbricks-build6-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup
@@ -2,14 +2,16 @@
 
 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
 
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
 	echo -n "Unmounting /tmp/disorderfs…"
-	fusermount -u /tmp/buildd
-	rmdir /tmp/buildd
-	mv /tmp/disorderfs /tmp/buildd
+	fusermount -u "$BUILDDIR"
+	rmdir "$BUILDDIR"
+	mv /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 fi
diff --git a/hosts/profitbricks-build6-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup b/hosts/profitbricks-build6-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup
index 6ec09822..73f4083c 100755
--- a/hosts/profitbricks-build6-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup
+++ b/hosts/profitbricks-build6-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup
@@ -2,6 +2,8 @@
 
 set -e
 
+BUILDDIR="${BUILDDIR:-/tmp/buildd}"
+
 echo "debug output: disk usage on $(hostname) at $(date -u)"
 df -h
 echo
@@ -12,8 +14,8 @@ echo
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
 	echo -n "Unmounting /tmp/disorderfs…"
-	fusermount -u /tmp/buildd
-	rmdir /tmp/buildd
-	mv /tmp/disorderfs /tmp/buildd
+	fusermount -u "$BUILDDIR"
+	rmdir "$BUILDDIR"
+	mv /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 fi
diff --git a/hosts/profitbricks-build6-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/profitbricks-build6-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 52862f16..dda76947 100755
--- a/hosts/profitbricks-build6-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/profitbricks-build6-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
 
@@ -17,11 +19,11 @@ exit 0
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
-	echo -n "Moving /tmp/buildd to /tmp/disorderfs and mounting this as /tmp/buildd 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 /tmp/buildd /tmp/disorderfs
-	mkdir /tmp/buildd
-	disorderfs --multi-user=yes /tmp/disorderfs /tmp/buildd
+	mv "$BUILDDIR" /tmp/disorderfs
+	mkdir "$BUILDDIR"
+	disorderfs --multi-user=yes /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 else
 	echo "Warning: disorderfs not available."
diff --git a/hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup b/hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
index c60a991c..bbea69fa 100755
--- a/hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
+++ b/hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
@@ -2,14 +2,16 @@
 
 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
 
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
 	echo -n "Unmounting /tmp/disorderfs…"
-	fusermount -u /tmp/buildd
-	rmdir /tmp/buildd
-	mv /tmp/disorderfs /tmp/buildd
+	fusermount -u "$BUILDDIR"
+	rmdir "$BUILDDIR"
+	mv /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 fi
diff --git a/hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup b/hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
index 6ec09822..73f4083c 100755
--- a/hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
+++ b/hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
@@ -2,6 +2,8 @@
 
 set -e
 
+BUILDDIR="${BUILDDIR:-/tmp/buildd}"
+
 echo "debug output: disk usage on $(hostname) at $(date -u)"
 df -h
 echo
@@ -12,8 +14,8 @@ echo
 # cease using disorderfs
 if [ -d /tmp/disorderfs ] ; then
 	echo -n "Unmounting /tmp/disorderfs…"
-	fusermount -u /tmp/buildd
-	rmdir /tmp/buildd
-	mv /tmp/disorderfs /tmp/buildd
+	fusermount -u "$BUILDDIR"
+	rmdir "$BUILDDIR"
+	mv /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 fi
diff --git a/hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 52862f16..dda76947 100755
--- a/hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/wbq0-armhf-rb/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
 
@@ -17,11 +19,11 @@ exit 0
 
 # use disorderfs
 if [ -x /usr/bin/disorderfs ] ; then
-	echo -n "Moving /tmp/buildd to /tmp/disorderfs and mounting this as /tmp/buildd 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 /tmp/buildd /tmp/disorderfs
-	mkdir /tmp/buildd
-	disorderfs --multi-user=yes /tmp/disorderfs /tmp/buildd
+	mv "$BUILDDIR" /tmp/disorderfs
+	mkdir "$BUILDDIR"
+	disorderfs --multi-user=yes /tmp/disorderfs "$BUILDDIR"
 	echo " done."
 else
 	echo "Warning: disorderfs not available."