Move ROOTFSDIR declaration to testing.conf

diff --git a/testing/scripts/build-umlhostfs b/testing/scripts/build-umlhostfs
index b4efc0ecbd50f62197bba89a094dd09041ee6e87..2ed8b504a5bc0450ed66b457dd07e8429b50c9c1 100755 (executable)
--- a/testing/scripts/build-umlhostfs
+++ b/testing/scripts/build-umlhostfs
@@ -21,7 +21,6 @@ echo "Creating guest images"
 [ `id -u` -eq 0 ] || die "You must be root to run $0"
 
 BASE=$BUILDDIR/base.img
-ROOTFSDIR=$BUILDDIR/root-fs
 HOSTSDIR=$PWD/hosts
 
 [ -f $BASE ] || die "Base image $BASE not found"

diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-umlrootfs
index a93adac4c0d004e1c8dd1ef69ebba9b25d16c258..4340e6ebc47f56d7523ec670f33c105d79c429f3 100755 (executable)
--- a/testing/scripts/build-umlrootfs
+++ b/testing/scripts/build-umlrootfs
@@ -22,7 +22,6 @@ echo "Building root image"
 
 [ -f "$ROOTFS" ] || die "Root image $ROOTFS not found"
 
-ROOTFSDIR=$BUILDDIR/root-fs
 mkdir -p $ROOTFSDIR
 mkdir -p $LOOPDIR
 mkdir -p $ROOTFSCOMPILEDIR

diff --git a/testing/testing.conf b/testing/testing.conf
index 59ed9b35848252d7fd7101c679d7369e2b79393c..6bec7c2553ab7381ea5a0e63ebc10d6747a92937 100755 (executable)
--- a/testing/testing.conf
+++ b/testing/testing.conf
@@ -55,6 +55,9 @@ ROOTFS=$BUILDDIR/debian-$ROOTFSSUITE-$ROOTFSARCH.img
 ROOTFSMIRROR=http://cdn.debian.net/debian
 ROOTFSCOMPILEDIR=$BUILDDIR/compile
 
+# Path to guest images
+ROOTFSDIR=$BUILDDIR/root-fs
+
 # Filename of the built UML Kernel
 UMLKERNEL=$BUILDDIR/linux-uml-$KERNELVERSION