Rename build-umlhostfs script to build-guestimages

diff --git a/testing/make-testing b/testing/make-testing
index 1980e3b7da09d09633d0086a51bd3e0df8699268..2daf131447188024e2bcf9e59876f8e0ab218f6a 100755 (executable)
--- 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
similarity index 99%
rename from testing/scripts/build-umlhostfs
rename to testing/scripts/build-guestimages
index fc2660c08a2b556766fafbb05b37a2bc60e65b0b..adcc522cf09582a03195d5bffacee1a5a9e2d6f3 100755 (executable)
--- 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 4ed5fdd001b6bdb3d63c892e54250cecc8bffc6f..7b67c29d2d4fec623c0bd9fa8ce0f0baf3873f99 100644 (file)
--- 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