diff options
| author | Reto Buerki <reet@codelabs.ch> | 2012-12-10 10:33:19 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2013-01-17 16:54:55 +0100 |
| commit | 90dd71e41c612211027963764b6993b861edd3f9 (patch) | |
| tree | 322bc536efbcaefe2a44bf2969d2574111de45c6 | |
| parent | 258cbd40cff463f4adb57f40d3338e460c7e90f2 (diff) | |
| download | strongswan-90dd71e41c612211027963764b6993b861edd3f9.tar.bz2 strongswan-90dd71e41c612211027963764b6993b861edd3f9.tar.xz | |
Rename build-umlrootfs script to build-rootimg
| -rwxr-xr-x | testing/make-testing | 8 | ||||
| -rwxr-xr-x | testing/scripts/build-rootimage (renamed from testing/scripts/build-umlrootfs) | 1 | ||||
| -rw-r--r-- | testing/testing.conf | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/testing/make-testing b/testing/make-testing index 7c2e4d567..1980e3b7d 100755 --- 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 index 1c452f476..1890c4eed 100755 --- 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 d4f520de1..4ed5fdd00 100644 --- 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" ############################################################## |