From owner-svn-src-projects@FreeBSD.ORG  Sat Nov  8 12:23:51 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8F296AE3;
 Sat,  8 Nov 2014 12:23:51 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7C6BAA74;
 Sat,  8 Nov 2014 12:23:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA8CNpdc087133;
 Sat, 8 Nov 2014 12:23:51 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA8CNpBO087132;
 Sat, 8 Nov 2014 12:23:51 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201411081223.sA8CNpBO087132@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 8 Nov 2014 12:23:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r274280 - projects/release-vmimage/release/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Nov 2014 12:23:51 -0000

Author: gjb
Date: Sat Nov  8 12:23:50 2014
New Revision: 274280
URL: https://svnweb.freebsd.org/changeset/base/274280

Log:
  Return if vm_create_disk() is unsuccessful.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-vmimage/release/scripts/mk-vmimage.sh

Modified: projects/release-vmimage/release/scripts/mk-vmimage.sh
==============================================================================
--- projects/release-vmimage/release/scripts/mk-vmimage.sh	Sat Nov  8 11:56:26 2014	(r274279)
+++ projects/release-vmimage/release/scripts/mk-vmimage.sh	Sat Nov  8 12:23:50 2014	(r274280)
@@ -93,7 +93,7 @@ main() {
 	vm_extra_install_ports
 	vm_extra_enable_services
 	vm_extra_pre_umount
-	vm_create_disk
+	vm_create_disk || return 0
 	vm_extra_create_disk
 
 	return 0