From 8a636667f5bc776c33c4ccc862a60586c06fe181 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sat, 27 May 2017 12:20:22 +0200 Subject: Revert "reproducible Debian: add niceness variation (Closes: #863440)" This reverts commit a3b0ba495360ac94ef72482e971bfa5c704825a7. --- bin/reproducible_build.sh | 2 +- bin/reproducible_common.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 9018ceb6..3442cd02 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -701,7 +701,7 @@ EOF # remember to change the sudoers setting if you change the following command # (the 2nd build gets a longer timeout trying to make sure the first build # aint wasted when then 2nd happens on a highly loaded node) - sudo timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 12 \ + sudo timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice \ /usr/bin/unshare --uts -- \ /usr/sbin/pbuilder --build \ --configfile $TMPCFG \ diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index 9c93d3cf..433b2976 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -404,7 +404,6 @@ write_variation_table() { write_page "env BUILDUSERNAMEBUILDUSERNAME=\"pbuilder1\"BUILDUSERNAME=\"pbuilder2\"" write_page "env USERUSER=\"pbuilder1\"USER=\"pbuilder2\"" write_page "env HOMEHOME=\"/nonexistent/first-build\"HOME=\"/nonexistent/second-build\"" - write_page "niceness1012" write_page "uiduid=1111uid=2222" write_page "gidgid=1111gid=2222" write_page "/bin/sh/bin/dash/bin/bash" -- cgit v1.2.3-70-g09d2