summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-06-15 18:46:19 +0200
committerHolger Levsen <holger@layer-acht.org>2015-06-15 18:46:19 +0200
commit29db0e8eaa3efe5ad021ce5fdb7b39bd608f5d5f (patch)
treeb22af17e34a80900e3fab82953b8a9c464da1f5b /bin
parent0c7a58c92456e4d3c69c38424abf86cde5948a86 (diff)
downloadjenkins.debian.net-29db0e8eaa3efe5ad021ce5fdb7b39bd608f5d5f.tar.xz
Revert "reproducible: build: call timeout with sudo, and not the reverse, as a user-called timeout can't kill a root process + give pbuilder 6 minutes to exit after SIGTERM before SIGKILL"
This reverts commit 0c7a58c92456e4d3c69c38424abf86cde5948a86.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/reproducible_build.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index e0270a18..6cbc486b 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -368,8 +368,7 @@ first_build(){
local TMPCFG=$(mktemp -t pbuilderrc_XXXX --tmpdir=$TMPDIR)
set -x
printf "BUILDUSERID=1111\nBUILDUSERNAME=pbuilder1\n" > $TMPCFG
- # remember to change the sudoers setting if you change the following command
- ( sudo timeout -k 12.1h 12h /usr/bin/ionice -c 3 /usr/bin/nice \
+ ( timeout -k 12h 12h ionice -c 3 nice sudo \
DEB_BUILD_OPTIONS="parallel=$NUM_CPU" \
TZ="/usr/share/zoneinfo/Etc/GMT+12" \
pbuilder --build \
@@ -427,8 +426,7 @@ build_rebuild() {
set -x
local TMPCFG=$(mktemp -t pbuilderrc_XXXX --tmpdir=$TMPDIR)
printf "BUILDUSERID=2222\nBUILDUSERNAME=pbuilder2\n" > $TMPCFG
- # remember to change the sudoers setting if you change the following command
- ( sudo timeout -k 12.1h 12h /usr/bin/ionice -c 3 /usr/bin/nice \
+ ( timeout -k 12h 12h ionice -c 3 nice sudo \
DEB_BUILD_OPTIONS="parallel=$(echo $NUM_CPU-1|bc)" \
TZ="/usr/share/zoneinfo/Etc/GMT-14" \
LANG="fr_CH.UTF-8" \