summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-08-29 11:01:49 +0200
committerHolger Levsen <holger@layer-acht.org>2015-08-29 11:01:49 +0200
commit2117bd876b1bdf5fc1762fcc593e42bf16093ed8 (patch)
tree3dd2324748a08e6874b57872f60bd5b81e08c3cc
parent80e6baaef710ccafa4c59e4132155ddd1a531254 (diff)
downloadjenkins.debian.net-2117bd876b1bdf5fc1762fcc593e42bf16093ed8.tar.xz
reproducible: temporarily disable disorderfs
-rwxr-xr-xhosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment1
-rw-r--r--hosts/jenkins/etc/pbuilderrc2
2 files changed, 2 insertions, 1 deletions
diff --git a/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 68364908..8cc09be5 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 2b8eecbb..fa06ba97 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