[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: temporarily disable disorderfs

[Holger Levsen]

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 2117bd876b1bdf5fc1762fcc593e42bf16093ed8
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Aug 29 11:01:49 2015 +0200

    reproducible: temporarily disable disorderfs
---
 hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment | 1 +
 hosts/jenkins/etc/pbuilderrc                                    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 6836490..8cc09be 100755
--- a/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -13,6 +13,7 @@ echo "I: Adding a custom variable just for the fun of it..." >&2
 export CAPTURE_ENVIRONMENT="I capture the environment"
 
 # use disorderfs, mount it as user
+exit 0
 if [ -x /usr/bin/disorderfs ] ; then
 	mv /tmp/buildd /tmp/disorderfs
 	sudo -u pbuilder2 disorderfs /tmp/disorderfs /tmp/buildd
diff --git a/hosts/jenkins/etc/pbuilderrc b/hosts/jenkins/etc/pbuilderrc
index 2b8eecb..fa06ba9 100644
--- a/hosts/jenkins/etc/pbuilderrc
+++ b/hosts/jenkins/etc/pbuilderrc
@@ -26,6 +26,6 @@ PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games"
 # used for reproducible builds tests, when doing the 2nd build
 if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then
 	PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path"
-	BINDMOUNTS="$BINDMOUNTS /dev/fuse"
+	#BINDMOUNTS="$BINDMOUNTS /dev/fuse"
 fi
 

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