From f930e15914adf2233bb4ff840764afb169521e91 Mon Sep 17 00:00:00 2001 From: gjb Date: Mon, 11 May 2015 14:53:07 +0000 Subject: 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 --- release/tools/vmimage.subr | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'release/tools') diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index d4cfc2d..262e245b 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -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} \ -- cgit v1.1