diff options
| author | Reto Buerki <reet@codelabs.ch> | 2012-12-06 16:58:37 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2013-01-17 15:22:09 +0100 |
| commit | b86866579ab3054a21120bca00b4bdfe8c8e575d (patch) | |
| tree | 1d5ead523683b6e8d4e61fbf89f6cb7551f85955 /testing/scripts/build-baseimage | |
| parent | 9574bf7a5e44a8ca5e77c8606683d0dc51ef3491 (diff) | |
| download | strongswan-b86866579ab3054a21120bca00b4bdfe8c8e575d.tar.bz2 strongswan-b86866579ab3054a21120bca00b4bdfe8c8e575d.tar.xz | |
Move execute wrappers to function.sh file
Diffstat (limited to 'testing/scripts/build-baseimage')
| -rwxr-xr-x | testing/scripts/build-baseimage | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage index 7e380f80c..de247786b 100755 --- a/testing/scripts/build-baseimage +++ b/testing/scripts/build-baseimage @@ -13,31 +13,6 @@ DIR=`dirname $0` [ -f $DIR/../testing.conf ] || die "!! Configuration file 'testing.conf' not found" . $DIR/../testing.conf -# execute command -# $1 - command to execute -# $2 - whether or not to log command exit status -# (0 -> disable exit status logging) -execute() -{ - cmd=${1} - echo $cmd >>$LOGFILE - $cmd >>$LOGFILE 2>&1 - status=$? - [ "$2" != 0 ] && log_status $status - if [ $status != 0 ]; then - echo "! command $cmd failed, exiting (status $status)" - echo "! check why here $LOGFILE" - exit 1 - fi -} - -# execute command in chroot -# $1 - command to execute -execute_chroot() -{ - execute "chroot $LOOPDIR $@" -} - # additional packages EXTRAS=build-essential,gperf,libgmp-dev,libldap2-dev,libcurl4-openssl-dev,libxml2-dev,libtspi-dev,libsqlite3-dev,openssh-server,tcpdump,psmisc,openssl,vim,sqlite3,conntrack,gdb,cmake,libxerces-c2-dev,libltdl-dev,liblog4cxx10-dev,libboost-thread-dev,libboost-system-dev,git-core SERVICES="isc-dhcp-server apache2 slapd" |