aboutsummaryrefslogtreecommitdiff
path: root/release/amd64
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2014-10-02 18:23:53 +0000
committerGlen Barber <gjb@FreeBSD.org>2014-10-02 18:23:53 +0000
commit47480336deb61b71d61682e993fa019a662e25a6 (patch)
treebe42a20ca2da06ff24b16c91af640a8cbbd921e1 /release/amd64
parentd04dbaf8281bc192c27ca5b4f8a4c92099f337f4 (diff)
downloadsrc-47480336deb61b71d61682e993fa019a662e25a6.tar.gz
src-47480336deb61b71d61682e993fa019a662e25a6.zip
If the vm-base target fails, prevent the vm-image target
from being run since it cannot possibly succeed. Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/projects/release-vmimage/; revision=272437
Diffstat (limited to 'release/amd64')
-rwxr-xr-xrelease/amd64/mk-vmimage.sh11
1 files changed, 11 insertions, 0 deletions
diff --git a/release/amd64/mk-vmimage.sh b/release/amd64/mk-vmimage.sh
index 30163e7e3895..e0bc976b2a2d 100755
--- a/release/amd64/mk-vmimage.sh
+++ b/release/amd64/mk-vmimage.sh
@@ -63,6 +63,17 @@ panic() {
if [ ! -z "${mddev}" ]; then
mdconfig -d -u ${mddev}
fi
+ case ${cmd} in
+ vm-base)
+ # If the vm-base target fails, the vm-image target
+ # cannot possibly succeed. Touch the .TARGET file
+ # so it is not attempted.
+ touch vm-image
+ ;;
+ *)
+ # FALLTHROUGH
+ ;;
+ esac
# Do not allow one failure case to chain through any remaining image
# builds.
return 1