From: Reto Buerki <reet@codelabs.ch>
Date: Mon, 10 Dec 2012 09:38:27 +0000 (+0100)
Subject: Rename build-umlhostfs script to build-guestimages
X-Git-Tag: 5.0.2rc1~1^2~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44e83859e0819c86d10007380da19829e3112f51;p=thirdparty%2Fstrongswan.git

Rename build-umlhostfs script to build-guestimages
---

diff --git a/testing/make-testing b/testing/make-testing
index 1980e3b7da..2daf131447 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
similarity index 99%
rename from testing/scripts/build-umlhostfs
rename to testing/scripts/build-guestimages
index fc2660c08a..adcc522cf0 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 4ed5fdd001..7b67c29d2d 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