summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-09-09 08:43:16 +0200
committerHolger Levsen <holger@layer-acht.org>2015-09-09 08:43:16 +0200
commit95670eabae1f49779ca6fceb26af13c8db0d06a9 (patch)
treec841cdc5433d499c665d62ed9756bc094bcbc9ab
parent0af6aae3dd13faea83cb7c71144c8752e70ac3af (diff)
downloadjenkins.debian.net-95670eabae1f49779ca6fceb26af13c8db0d06a9.tar.xz
only install sudo when explicitly asked for
-rwxr-xr-xbin/schroot-create.sh2
-rw-r--r--job-cfg/live.yaml2
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/schroot-create.sh b/bin/schroot-create.sh
index dfeff867..8e902cd0 100755
--- a/bin/schroot-create.sh
+++ b/bin/schroot-create.sh
@@ -156,7 +156,7 @@ bootstrap() {
if [ "$1" = "diffoscope" ] ; then
sudo chroot $CHROOT_TARGET apt-get install -y --install-recommends diffoscope
fi
- sudo chroot $CHROOT_TARGET apt-get install -y --no-install-recommends "$@" sudo
+ sudo chroot $CHROOT_TARGET apt-get install -y --no-install-recommends "$@"
# always use diffoscope from unstable
if [ "$SUITE" = "testing" ] && [ "$1" = "diffoscope" ] ; then
echo "deb $MIRROR unstable main" | sudo tee -a $CHROOT_TARGET/etc/apt/sources.list > /dev/null
diff --git a/job-cfg/live.yaml b/job-cfg/live.yaml
index eb71ed0d..7c1aefa7 100644
--- a/job-cfg/live.yaml
+++ b/job-cfg/live.yaml
@@ -78,5 +78,5 @@
- '{name}_setup_schroot':
my_description: 'Setup schroot for building live images using live-build in a jessie environment.'
my_time: '42 10 1 * *'
- my_shell: '/srv/jenkins/bin/schroot-create.sh live-jessie jessie python live-build'
+ my_shell: '/srv/jenkins/bin/schroot-create.sh live-jessie jessie sudo python live-build'