summaryrefslogtreecommitdiffstats
path: root/hosts
diff options
context:
space:
mode:
Diffstat (limited to 'hosts')
-rwxr-xr-xhosts/jenkins-test-vm/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/profitbricks-build10-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment4
3 files changed, 9 insertions, 3 deletions
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 5e442552..62ae3d03 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 5e442552..62ae3d03 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 5e442552..62ae3d03 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"