From 9fc197e9b5f7c48d99c9356a38ed0b872535c0b1 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sat, 29 Aug 2015 11:24:35 +0200 Subject: 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(+) (limited to 'hosts/jenkins') 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." -- cgit v1.2.3-70-g09d2