From owner-svn-src-projects@FreeBSD.ORG  Sat Nov  8 13:49:19 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 44664EDB;
 Sat,  8 Nov 2014 13:49:19 +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 31215168;
 Sat,  8 Nov 2014 13:49:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA8DnJXY026237;
 Sat, 8 Nov 2014 13:49:19 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA8DnJVB026236;
 Sat, 8 Nov 2014 13:49:19 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201411081349.sA8DnJVB026236@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 13:49:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r274287 - projects/release-vmimage/release/tools
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 13:49:19 -0000

Author: gjb
Date: Sat Nov  8 13:49:18 2014
New Revision: 274287
URL: https://svnweb.freebsd.org/changeset/base/274287

Log:
  Fix line continuation in write_partition_layout().
  Remove variable test that is no longer needed.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-vmimage/release/tools/vmimage.subr

Modified: projects/release-vmimage/release/tools/vmimage.subr
==============================================================================
--- projects/release-vmimage/release/tools/vmimage.subr	Sat Nov  8 13:19:48 2014	(r274286)
+++ projects/release-vmimage/release/tools/vmimage.subr	Sat Nov  8 13:49:18 2014	(r274287)
@@ -16,14 +16,14 @@ write_partition_layout() {
 			mkimg -f gpt -b /boot/pmbr \
 				-p freebsd-boot/bootfs:=/boot/gptboot \
 				-p freebsd-swap/swapfs::1G \
-				-p freebsd-ufs/rootfs:=${VMBASE}
+				-p freebsd-ufs/rootfs:=${VMBASE} \
 				-o ${VMIMAGE}
 			;;
 		powerpc:powerpc*)
 			mkimg -f apm \
 				-p freebsd-boot/bootfs:=/boot/boot1.hfs \
 				-p freebsd-swap/swapfs::1G \
-				-p freebsd-ufs/rootfs:=${VMBASE}
+				-p freebsd-ufs/rootfs:=${VMBASE} \
 				-o ${VMIMAGE}
 			;;
 		*)
@@ -146,10 +146,6 @@ vm_umount_base() {
 }
 
 vm_create_disk() {
-	if [ -z "${mkimg_paritions}" ]; then
-		err "No partition types specified.  Skipping."
-		return 1
-	fi
 	echo "Creating image...  Please wait."
 	echo