[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: simply 'mknod /dev/fuse' before using it, thanks Andrew

[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 3a50809e687454c80c99c02328e92b2b2261de33
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Aug 29 11:15:04 2015 +0200

    reproducible: simply 'mknod /dev/fuse' before using it, thanks Andrew
---
 hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment | 2 +-
 hosts/jenkins/etc/pbuilderrc                                    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 8cc09be..1179e6b 100755
--- a/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -13,8 +13,8 @@ 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
+	mknod -m 666 /dev/fuse c 10 229
 	mv /tmp/buildd /tmp/disorderfs
 	sudo -u pbuilder2 disorderfs /tmp/disorderfs /tmp/buildd
 else
diff --git a/hosts/jenkins/etc/pbuilderrc b/hosts/jenkins/etc/pbuilderrc
index fa06ba9..3c33001 100644
--- a/hosts/jenkins/etc/pbuilderrc
+++ b/hosts/jenkins/etc/pbuilderrc
@@ -26,6 +26,5 @@ 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"
 fi
 

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