diff options
| author | Reto Buerki <reet@codelabs.ch> | 2012-12-07 09:41:38 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2013-01-17 15:22:11 +0100 |
| commit | 62a277cfaed19b4fbc4a06e48273516cce6145d7 (patch) | |
| tree | 368225be23cb0f51ef5e6f124a6790651d7acf1d | |
| parent | ee1cd88c7aa09a36fcbea524303e23f32eeaae94 (diff) | |
| download | strongswan-62a277cfaed19b4fbc4a06e48273516cce6145d7.tar.bz2 strongswan-62a277cfaed19b4fbc4a06e48273516cce6145d7.tar.xz | |
Move ROOTFSDIR declaration to testing.conf
| -rwxr-xr-x | testing/scripts/build-umlhostfs | 1 | ||||
| -rwxr-xr-x | testing/scripts/build-umlrootfs | 1 | ||||
| -rwxr-xr-x | testing/testing.conf | 3 |
3 files changed, 3 insertions, 2 deletions
diff --git a/testing/scripts/build-umlhostfs b/testing/scripts/build-umlhostfs index b4efc0ecb..2ed8b504a 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 a93adac4c..4340e6ebc 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 59ed9b358..6bec7c255 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 |