diff options
| author | Jérémy Bobbio <lunar@debian.org> | 2015-01-19 19:38:47 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-01-19 19:43:06 +0100 |
| commit | 520c4505dd4b3abdb8c2d02b7828b2d8bdcf98f5 (patch) | |
| tree | c64f6dcc97aa2863b7d770c46062be41b0957926 | |
| parent | d28793402f6274ef4b2695b036b0af742cdd8e73 (diff) | |
| download | jenkins.debian.net-520c4505dd4b3abdb8c2d02b7828b2d8bdcf98f5.tar.xz | |
reproducible: unshare need to be told where options end
| -rwxr-xr-x | bin/reproducible_build.sh | 2 | ||||
| -rw-r--r-- | etc/sudoers.d/jenkins | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index a17816d4..075641d5 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -130,7 +130,7 @@ else echo "Re-building ${SRCPACKAGE} now." echo "=============================================================================" set -x - timeout 12h nice ionice -c 3 sudo DEB_BUILD_OPTIONS="parallel=$NUM_CPU" LANG="fr_CH.UTF-8" LC_ALL="fr_CH.UTF-8" unshare --uts /usr/sbin/pbuilder --build --configfile $TMPCFG --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts "-b" --basetgz /var/cache/pbuilder/base-reproducible.tgz --distribution sid ${SRCPACKAGE}_${EVERSION}.dsc + timeout 12h nice ionice -c 3 sudo DEB_BUILD_OPTIONS="parallel=$NUM_CPU" LANG="fr_CH.UTF-8" LC_ALL="fr_CH.UTF-8" unshare --uts -- /usr/sbin/pbuilder --build --configfile $TMPCFG --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts "-b" --basetgz /var/cache/pbuilder/base-reproducible.tgz --distribution sid ${SRCPACKAGE}_${EVERSION}.dsc set +x dcmd cp /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}_amd64.changes b2 # and again (see comment 5 lines above) diff --git a/etc/sudoers.d/jenkins b/etc/sudoers.d/jenkins index 91580c8d..77f2a142 100644 --- a/etc/sudoers.d/jenkins +++ b/etc/sudoers.d/jenkins @@ -30,7 +30,7 @@ jenkins ALL= \ /bin/cp -rv /media/*, \ /bin/chown -R jenkins\:jenkins /var/lib/jenkins/jobs/*,\ SETENV: NOPASSWD: /usr/sbin/pbuilder *, \ - SETENV: NOPASSWD: /usr/bin/unshare --uts /usr/sbin/pbuilder *, \ + SETENV: NOPASSWD: /usr/bin/unshare --uts -- /usr/sbin/pbuilder *, \ /bin/mv /var/cache/pbuilder/base*.tgz /var/cache/pbuilder/base*.tgz, \ /bin/rm /var/cache/pbuilder/base*.tgz, \ /bin/rm -v /var/cache/pbuilder/base*.tgz, \ |