diff options
| -rwxr-xr-x | testing/make-testing | 4 | ||||
| -rwxr-xr-x | testing/scripts/build-guestimages (renamed from testing/scripts/build-umlhostfs) | 3 | ||||
| -rw-r--r-- | testing/testing.conf | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/testing/make-testing b/testing/make-testing index 1980e3b7d..2daf13144 100755 --- a/testing/make-testing +++ b/testing/make-testing @@ -19,7 +19,7 @@ then $PWD/scripts/build-guestkernel || exit 1 fi -if [ $ENABLE_BUILD_UMLHOSTFS = "yes" ] +if [ $ENABLE_BUILD_GUESTIMAGES = "yes" ] then - $PWD/scripts/build-umlhostfs $HOSTS || exit 1 + $PWD/scripts/build-guestimages $HOSTS || exit 1 fi diff --git a/testing/scripts/build-umlhostfs b/testing/scripts/build-guestimages index fc2660c08..adcc522cf 100755 --- a/testing/scripts/build-umlhostfs +++ b/testing/scripts/build-guestimages @@ -18,10 +18,9 @@ echo "Creating guest images" . $PWD/scripts/function.sh -[ `id -u` -eq 0 ] || die "You must be root to run $0" - HOSTSDIR=$PWD/hosts +[ `id -u` -eq 0 ] || die "You must be root to run $0" [ -f $ROOTIMG ] || die "Root image $ROOTIMG not found" [ -f $HOSTDIR ] || die "Hosts directory $HOSTSDIR not found" diff --git a/testing/testing.conf b/testing/testing.conf index 4ed5fdd00..7b67c29d2 100644 --- a/testing/testing.conf +++ b/testing/testing.conf @@ -73,7 +73,7 @@ SSHCONF="-F $TESTDIR/testing/ssh_config" ENABLE_BUILD_BASEIMAGE="yes" ENABLE_BUILD_ROOTIMAGE="yes" ENABLE_BUILD_GUESTKERNEL="yes" -ENABLE_BUILD_UMLHOSTFS="yes" +ENABLE_BUILD_GUESTIMAGES="yes" ############################################################## # If set to "yes" only the tests stated at $SELECTEDTESTS |