summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-09-22 17:31:29 +0200
committerHolger Levsen <holger@layer-acht.org>2015-09-22 17:31:29 +0200
commitcf01779811629bb202cc45cea3bdcc4bac2608bc (patch)
treedfee570a1bafe522b2dfd81a9011b3297a0257a0
parent04ff41f2995bba2e3556a83e7b51787106268fb3 (diff)
downloadjenkins.debian.net-cf01779811629bb202cc45cea3bdcc4bac2608bc.tar.xz
reproducible: (would) use new --multi-user=yes feature from disorderfs 0.3.0-1
-rw-r--r--TODO1
-rwxr-xr-xhosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment7
2 files changed, 4 insertions, 4 deletions
diff --git a/TODO b/TODO
index e9238b49..cb12d966 100644
--- a/TODO
+++ b/TODO
@@ -200,6 +200,7 @@ properties:
** pkg sets are still amd64 only atm…
** use disorderfs:
*** code is there but disabled, but scripts are only in hosts/jenkins/ and need to be copied to hosts/*/
+*** needs disorderfs 0.3.0-1 to be in testing first… (or uploaded to our repo)
*** document usage in diff table...
* lesser prio
diff --git a/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 7f099dcd..9d0d4408 100755
--- a/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -12,14 +12,13 @@ domainname i-capture-the-domain
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
+# use disorderfs
+exit 0 # currently disabled
if [ -x /usr/bin/disorderfs ] ; then
mknod -m 666 /dev/fuse c 10 229
mv /tmp/buildd /tmp/disorderfs
mkdir /tmp/buildd
- chown pbuilder2 /tmp/buildd
- su pbuilder2 -c 'disorderfs /tmp/disorderfs /tmp/buildd'
+ disorderfs --multi-user=yes /tmp/disorderfs /tmp/buildd
else
echo "Warning: disorderfs not available."
fi