aboutsummaryrefslogtreecommitdiffstats
path: root/testing/scripts/build-baseimage
diff options
context:
space:
mode:
authorReto Buerki <reet@codelabs.ch>2012-12-06 19:03:45 +0100
committerTobias Brunner <tobias@strongswan.org>2013-01-17 15:22:10 +0100
commit7c2ef58e86c10e0cf9846dc9211cc68c7e908f7f (patch)
treea25052fa664b62f96b091855e9c1f08e9622701e /testing/scripts/build-baseimage
parent261cf0e395ec43634e49e3f431cd189d69f03edc (diff)
downloadstrongswan-7c2ef58e86c10e0cf9846dc9211cc68c7e908f7f.tar.bz2
strongswan-7c2ef58e86c10e0cf9846dc9211cc68c7e908f7f.tar.xz
Import testing.conf file in function.sh
This is needed to have access to $LOGFILE and possibly other config settings.
Diffstat (limited to 'testing/scripts/build-baseimage')
-rwxr-xr-xtesting/scripts/build-baseimage7
1 files changed, 1 insertions, 6 deletions
diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage
index 08da30f08..4b81c5cdb 100755
--- a/testing/scripts/build-baseimage
+++ b/testing/scripts/build-baseimage
@@ -2,15 +2,10 @@
echo "Building base image"
-DIR=`dirname $0`
-
-. $DIR/function.sh
+. $PWD/scripts/function.sh
[ `id -u` -eq 0 ] || die "You must be root to run $0"
-[ -f $DIR/../testing.conf ] || die "Configuration file 'testing.conf' not found"
-. $DIR/../testing.conf
-
# 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"