summaryrefslogtreecommitdiffstats
path: root/hosts/profitbricks-build4-amd64/etc
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@mapreri.org>2015-10-17 17:49:53 +0000
committerHolger Levsen <holger@layer-acht.org>2015-10-18 19:38:35 +0200
commitcea92184c20796475f80a7a0c113bee9d24e9cf7 (patch)
tree9c3e5e63968f3dd2eeba42fa94b26451d0c159e3 /hosts/profitbricks-build4-amd64/etc
parent759e58ba54cfeba14ee305fc8e91cadb361fed93 (diff)
downloadjenkins.debian.net-cea92184c20796475f80a7a0c113bee9d24e9cf7.tar.xz
reproducible pbuilder hooks: use BUILDDIR, to comply with pbuilder 0.216
Diffstat (limited to 'hosts/profitbricks-build4-amd64/etc')
-rwxr-xr-xhosts/profitbricks-build4-amd64/etc/pbuilder/rebuild-hooks/B01_cleanup8
-rwxr-xr-xhosts/profitbricks-build4-amd64/etc/pbuilder/rebuild-hooks/C01_cleanup8
-rwxr-xr-xhosts/profitbricks-build4-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment10
3 files changed, 16 insertions, 10 deletions
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."