svn commit: r272437 - in projects/release-vmimage/release: amd64 i386

[Glen Barber]

Author: gjb
Date: Thu Oct  2 18:23:53 2014
New Revision: 272437
URL: https://svnweb.freebsd.org/changeset/base/272437

Log:
  If the vm-base target fails, prevent the vm-image target
  from being run since it cannot possibly succeed.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-vmimage/release/amd64/mk-vmimage.sh
  projects/release-vmimage/release/i386/mk-vmimage.sh

Modified: projects/release-vmimage/release/amd64/mk-vmimage.sh
==============================================================================
--- projects/release-vmimage/release/amd64/mk-vmimage.sh	Thu Oct  2 18:20:01 2014	(r272436)
+++ projects/release-vmimage/release/amd64/mk-vmimage.sh	Thu Oct  2 18:23:53 2014	(r272437)
@@ -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

Modified: projects/release-vmimage/release/i386/mk-vmimage.sh
==============================================================================
--- projects/release-vmimage/release/i386/mk-vmimage.sh	Thu Oct  2 18:20:01 2014	(r272436)
+++ projects/release-vmimage/release/i386/mk-vmimage.sh	Thu Oct  2 18:23:53 2014	(r272437)
@@ -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