[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: mkdir+rmdir mountpoint correctly

Holger Levsen holger at moszumanska.debian.org
Sat Aug 29 09:24:54 UTC 2015


This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 9fc197e9b5f7c48d99c9356a38ed0b872535c0b1
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Aug 29 11:24:35 2015 +0200

    reproducible: mkdir+rmdir mountpoint correctly
---
 hosts/jenkins/etc/pbuilder/rebuild-hooks/B01_cleanup            | 1 +
 hosts/jenkins/etc/pbuilder/rebuild-hooks/C01_cleanup            | 1 +
 hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment | 1 +
 3 files changed, 3 insertions(+)

diff --git a/hosts/jenkins/etc/pbuilder/rebuild-hooks/B01_cleanup b/hosts/jenkins/etc/pbuilder/rebuild-hooks/B01_cleanup
index 6f1add5..40c8c43 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 6f1add5..40c8c43 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 31e996a..3955710 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."

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git



More information about the Qa-jenkins-scm mailing list