From 3a9c01363a0af7c64179c19f1d6e884c4a7cb873 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Fri, 25 Apr 2014 16:46:33 +0200 Subject: use common functions. runs all scripts as copies from /tmp, so the source scripts can be updated while running. --- bin/chroot-installation.sh | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'bin/chroot-installation.sh') diff --git a/bin/chroot-installation.sh b/bin/chroot-installation.sh index 921a9315..ce161477 100755 --- a/bin/chroot-installation.sh +++ b/bin/chroot-installation.sh @@ -1,8 +1,11 @@ #!/bin/bash -# Copyright 2012,2013 Holger Levsen +# Copyright 2012-2014 Holger Levsen # released under the GPLv=2 +. /srv/jenkins/bin/common-functions.sh +common_init "$@" + # $1 = base distro # $2 = extra component # $3 = upgrade distro @@ -19,22 +22,6 @@ SLEEP=$(shuf -i 1-10 -n 1) echo "Sleeping $SLEEP seconds to randomize start times and parallel runs." sleep $SLEEP -# -# default settings -# -set -x -set -e -export LC_ALL=C -export MIRROR=http://ftp.de.debian.org/debian -export http_proxy="http://localhost:3128" - -export SCRIPT_HEADER="#!/bin/bash -set -x -set -e -export DEBIAN_FRONTEND=noninteractive -export LC_ALL=C -export http_proxy=$http_proxy" - export CHROOT_TARGET=$(mktemp -d -p /chroots/ chroot-installation-$1.XXXXXXXXX) export TMPFILE=$(mktemp -u) export CTMPFILE=$CHROOT_TARGET/$TMPFILE -- cgit v1.2.3-70-g09d2