svn commit: r282877 - stable/10/release/tools

[Glen Barber]

Author: gjb
Date: Thu May 14 04:21:04 2015
New Revision: 282877
URL: https://svnweb.freebsd.org/changeset/base/282877

Log:
  MFC r282772:
    Fix virtual machine disk format creating by passing VMFORMAT
    to mkimg(1)
  
  PR:		200068
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/tools/vmimage.subr

Modified: stable/10/release/tools/vmimage.subr
==============================================================================
--- stable/10/release/tools/vmimage.subr	Thu May 14 04:17:58 2015	(r282876)
+++ stable/10/release/tools/vmimage.subr	Thu May 14 04:21:04 2015	(r282877)
@@ -23,14 +23,15 @@ write_partition_layout() {
 
 	case "${TARGET}:${TARGET_ARCH}" in
 		amd64:amd64 | i386:i386)
-			mkimg -s gpt -b ${BOOTFILES}/i386/pmbr/pmbr \
+			mkimg -s gpt -f ${VMFORMAT} \
+				-b ${BOOTFILES}/i386/pmbr/pmbr \
 				-p freebsd-boot/bootfs:=${BOOTFILES}/i386/gptboot/gptboot \
 				${SWAPOPT} \
 				-p freebsd-ufs/rootfs:=${VMBASE} \
 				-o ${VMIMAGE}
 			;;
 		powerpc:powerpc*)
-			mkimg -s apm \
+			mkimg -s apm -f ${VMFORMAT} \
 				-p apple-boot/bootfs:=${BOOTFILES}/powerpc/boot1.chrp/boot1.hfs \
 				${SWAPOPT} \
 				-p freebsd-ufs/rootfs:=${VMBASE} \