summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-09-23 00:23:58 +0200
committerHolger Levsen <holger@layer-acht.org>2015-09-23 00:23:58 +0200
commiteb4df47512bd74b06686f841edded7cf23b16d70 (patch)
tree13f78aee1e7174bbd21627e567d899886c181745
parent0d0494618ae22303fc4761f7ba65bd4575aba8f7 (diff)
downloadjenkins.debian.net-eb4df47512bd74b06686f841edded7cf23b16d70.tar.xz
reproducible: be more verbose when mounting+unmounting with disorderfs
-rwxr-xr-xhosts/jenkins/etc/pbuilder/rebuild-hooks/B01_cleanup2
-rwxr-xr-xhosts/jenkins/etc/pbuilder/rebuild-hooks/C01_cleanup2
-rwxr-xr-xhosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment2
3 files changed, 6 insertions, 0 deletions
diff --git a/hosts/jenkins/etc/pbuilder/rebuild-hooks/B01_cleanup b/hosts/jenkins/etc/pbuilder/rebuild-hooks/B01_cleanup
index 36a19bc9..c60a991c 100755
--- a/hosts/jenkins/etc/pbuilder/rebuild-hooks/B01_cleanup
+++ b/hosts/jenkins/etc/pbuilder/rebuild-hooks/B01_cleanup
@@ -7,7 +7,9 @@ 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
+ echo " done."
fi
diff --git a/hosts/jenkins/etc/pbuilder/rebuild-hooks/C01_cleanup b/hosts/jenkins/etc/pbuilder/rebuild-hooks/C01_cleanup
index 36a19bc9..c60a991c 100755
--- a/hosts/jenkins/etc/pbuilder/rebuild-hooks/C01_cleanup
+++ b/hosts/jenkins/etc/pbuilder/rebuild-hooks/C01_cleanup
@@ -7,7 +7,9 @@ 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
+ 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 aed8d9ab..06979737 100755
--- a/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -14,10 +14,12 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
# 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…"
mknod -m 666 /dev/fuse c 10 229
mv /tmp/buildd /tmp/disorderfs
mkdir /tmp/buildd
disorderfs --multi-user=yes /tmp/disorderfs /tmp/buildd
+ echo " done."
else
echo "Warning: disorderfs not available."
fi