summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-01-01 23:04:08 +0100
committerHolger Levsen <holger@layer-acht.org>2015-01-01 23:04:08 +0100
commit43b565aeb6edb73f0977b264aebb95199d82df0e (patch)
tree128dc34384ec8946689c709fbe6cc1633bca59d9
parent74cc97dabfc10262ba0dd22a643ef41e13fd4261 (diff)
downloadjenkins.debian.net-43b565aeb6edb73f0977b264aebb95199d82df0e.tar.xz
fixup
-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 6e2fca46..7d5f3bc1 100755
--- a/bin/schroot-create.sh
+++ b/bin/schroot-create.sh
@@ -60,7 +60,7 @@ bootstrap() {
for d in proc dev dev/pts ; do
sudo mount --bind /$d $CHROOT_TARGET/$d
done
- sudo chroot $CHROOT_TARGET apt-get install -y --no-install-recommends "sudo $@"
+ sudo chroot $CHROOT_TARGET apt-get install -y --no-install-recommends "$@" sudo
# umount in reverse order
for d in dev/pts dev proc ; do
sudo umount -l $CHROOT_TARGET/$d
diff --git a/job-cfg/live.yaml b/job-cfg/live.yaml
index 05fdf470..a88da9f8 100644
--- a/job-cfg/live.yaml
+++ b/job-cfg/live.yaml
@@ -50,5 +50,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 sudo live-build'
+ my_shell: '/srv/jenkins/bin/schroot-create.sh live-jessie jessie python live-build'