Author: gjb
Date: Mon May 11 14:53:07 2015
New Revision: 282772
URL: https://svnweb.freebsd.org/changeset/base/282772
Log:
Fix virtual machine disk format creating by passing VMFORMAT
to mkimg(1)
PR: 200068
Submitted by: Jeremy Norris
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
Modified:
head/release/tools/vmimage.subr
Modified: head/release/tools/vmimage.subr
==============================================================================
--- head/release/tools/vmimage.subr Mon May 11 14:36:34 2015
(r282771)
+++ head/release/tools/vmimage.subr Mon May 11 14:53:07 2015
(r282772)
@@ -23,20 +23,21 @@ 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}
;;
arm64:aarch64)
- mkimg -s mbr \
+ mkimg -s mbr -f ${VMFORMAT} \
-p efi:=${BOOTFILES}/efi/boot1/boot1.efifat \
-p freebsd:=${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} \
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
