summaryrefslogtreecommitdiffstats
path: root/hosts/jenkins/etc
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-08-29 11:24:35 +0200
committerHolger Levsen <holger@layer-acht.org>2015-08-29 11:24:35 +0200
commit9fc197e9b5f7c48d99c9356a38ed0b872535c0b1 (patch)
tree36e3156e72073c04ae97951f4bdfc9378e1f853b /hosts/jenkins/etc
parent9abe01761ba80201a5414232ecfe1075ee13456b (diff)
downloadjenkins.debian.net-9fc197e9b5f7c48d99c9356a38ed0b872535c0b1.tar.xz
reproducible: mkdir+rmdir mountpoint correctly
Diffstat (limited to 'hosts/jenkins/etc')
-rwxr-xr-xhosts/jenkins/etc/pbuilder/rebuild-hooks/B01_cleanup1
-rwxr-xr-xhosts/jenkins/etc/pbuilder/rebuild-hooks/C01_cleanup1
-rwxr-xr-xhosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment1
3 files changed, 3 insertions, 0 deletions
diff --git a/hosts/jenkins/etc/pbuilder/rebuild-hooks/B01_cleanup b/hosts/jenkins/etc/pbuilder/rebuild-hooks/B01_cleanup
index 6f1add53..40c8c432 100755
--- a/hosts/jenkins/etc/pbuilder/rebuild-hooks/B01_cleanup
+++ b/hosts/jenkins/etc/pbuilder/rebuild-hooks/B01_cleanup
@@ -8,5 +8,6 @@ set -e
# cease using disorderfs
if [ -d /tmp/disorderfs ] ; then
su pbuilder2 -c 'fusermount -u /tmp/buildd'
+ rmdir /tmp/buildd
mv /tmp/disorderfs /tmp/buildd
fi
diff --git a/hosts/jenkins/etc/pbuilder/rebuild-hooks/C01_cleanup b/hosts/jenkins/etc/pbuilder/rebuild-hooks/C01_cleanup
index 6f1add53..40c8c432 100755
--- a/hosts/jenkins/etc/pbuilder/rebuild-hooks/C01_cleanup
+++ b/hosts/jenkins/etc/pbuilder/rebuild-hooks/C01_cleanup
@@ -8,5 +8,6 @@ set -e
# cease using disorderfs
if [ -d /tmp/disorderfs ] ; then
su pbuilder2 -c 'fusermount -u /tmp/buildd'
+ rmdir /tmp/buildd
mv /tmp/disorderfs /tmp/buildd
fi
diff --git a/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 31e996ae..3955710d 100755
--- a/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -16,6 +16,7 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
if [ -x /usr/bin/disorderfs ] ; then
mknod -m 666 /dev/fuse c 10 229
mv /tmp/buildd /tmp/disorderfs
+ mkdir /tmp/buildd
su pbuilder2 -c 'disorderfs /tmp/disorderfs /tmp/buildd'
else
echo "Warning: disorderfs not available."