MFC r282772:

Fix virtual machine disk format creating by passing VMFORMAT
  to mkimg(1)

PR:		200068
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
gjb 2015-05-14 04:21:04 +00:00
parent 577cf5c11f
commit 677d1a06c2

View File

@ -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} \