From 62a277cfaed19b4fbc4a06e48273516cce6145d7 Mon Sep 17 00:00:00 2001 From: Reto Buerki Date: Fri, 7 Dec 2012 09:41:38 +0100 Subject: [PATCH] Move ROOTFSDIR declaration to testing.conf --- testing/scripts/build-umlhostfs | 1 - testing/scripts/build-umlrootfs | 1 - testing/testing.conf | 3 +++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/testing/scripts/build-umlhostfs b/testing/scripts/build-umlhostfs index b4efc0ecbd..2ed8b504a5 100755 --- 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 a93adac4c0..4340e6ebc4 100755 --- 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 59ed9b3584..6bec7c2553 100755 --- 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 -- 2.47.2