Import testing.conf file in function.sh

This is needed to have access to $LOGFILE and possibly other config
settings.
This commit is contained in:
Reto Buerki
2013-01-17 15:22:10 +01:00
committed by Tobias Brunner
parent 261cf0e395
commit 7c2ef58e86
10 changed files with 26 additions and 72 deletions
+2 -7
View File
@@ -16,18 +16,13 @@
echo "Creating guest images"
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
BASE=$BUILDDIR/base.img
ROOTFSDIR=$BUILDDIR/root-fs
HOSTSDIR=$DIR/../hosts
HOSTSDIR=$PWD/hosts
[ -f $BASE ] || die "Base image $BASE not found"
[ -f $HOSTDIR ] || die "Hosts directory $HOSTSDIR not found"