Import testing.conf file in function.sh

This is needed to have access to $LOGFILE and possibly other config settings.
2013-01-17 15:22:10 +01:00
parent 261cf0e395
commit 7c2ef58e86
10 changed files with 26 additions and 72 deletions
@@ -16,15 +16,10 @@

 echo "Building root 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
-
 [ -f "$ROOTFS" ] || die "Root image $ROOTFS not found"

 ROOTFSDIR=$BUILDDIR/root-fs