Rename build-umlrootfs script to build-rootimg

testing/make-testing

@@ -9,16 +9,16 @@ then
 	$PWD/scripts/build-baseimage || exit 1
 fi
 
+if [ $ENABLE_BUILD_ROOTIMAGE = "yes" ]
+then
+	$PWD/scripts/build-rootimage || exit 1
+fi
+
 if [ $ENABLE_BUILD_GUESTKERNEL = "yes" ]
 then
 	$PWD/scripts/build-guestkernel || exit 1
 fi
 
-if [ $ENABLE_BUILD_UMLROOTFS = "yes" ]
-then
-	$PWD/scripts/build-umlrootfs || exit 1
-fi
-
 if [ $ENABLE_BUILD_UMLHOSTFS = "yes" ]
 then
 	$PWD/scripts/build-umlhostfs $HOSTS || exit 1

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

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"
 
 ##############################################################