Rename build-umlrootfs script to build-rootimg

diff --git a/testing/make-testing b/testing/make-testing
index 7c2e4d56748c564a5a93a4325428d85dcccb948d..1980e3b7da09d09633d0086a51bd3e0df8699268 100755 (executable)
--- a/testing/make-testing
+++ b/testing/make-testing
@@ -9,14 +9,14 @@ then
        $PWD/scripts/build-baseimage || exit 1
 fi
 
-if [ $ENABLE_BUILD_GUESTKERNEL = "yes" ]
+if [ $ENABLE_BUILD_ROOTIMAGE = "yes" ]
 then
-       $PWD/scripts/build-guestkernel || exit 1
+       $PWD/scripts/build-rootimage || exit 1
 fi
 
-if [ $ENABLE_BUILD_UMLROOTFS = "yes" ]
+if [ $ENABLE_BUILD_GUESTKERNEL = "yes" ]
 then
-       $PWD/scripts/build-umlrootfs || exit 1
+       $PWD/scripts/build-guestkernel || exit 1
 fi
 
 if [ $ENABLE_BUILD_UMLHOSTFS = "yes" ]

diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-rootimage
similarity index 99%
rename from testing/scripts/build-umlrootfs
rename to testing/scripts/build-rootimage
index 1c452f476397e9345a7e4400e97d2365870bd4cc..1890c4eed7b464af6a64667a06a7912bf695cac1 100755 (executable)
--- a/testing/scripts/build-umlrootfs
+++ b/testing/scripts/build-rootimage
@@ -19,7 +19,6 @@ echo "Building root image"
 . $PWD/scripts/function.sh
 
 [ `id -u` -eq 0 ] || die "You must be root to run $0"
-
 [ -f "$BASEIMG" ] || die "Base image $BASEIMG not found"
 
 check_commands partprobe qemu-nbd

diff --git a/testing/testing.conf b/testing/testing.conf
index d4f520de11530acacc6e23d6f0607b1ce8e4fb4b..4ed5fdd001b6bdb3d63c892e54250cecc8bffc6f 100644 (file)
--- a/testing/testing.conf
+++ b/testing/testing.conf
@@ -71,8 +71,8 @@ SSHCONF="-F $TESTDIR/testing/ssh_config"
 # Enable particular steps in the make-testing
 #
 ENABLE_BUILD_BASEIMAGE="yes"
+ENABLE_BUILD_ROOTIMAGE="yes"
 ENABLE_BUILD_GUESTKERNEL="yes"
-ENABLE_BUILD_UMLROOTFS="yes"
 ENABLE_BUILD_UMLHOSTFS="yes"
 
 ##############################################################