aboutsummaryrefslogtreecommitdiff
path: root/release/tools/vmimage.subr
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2015-05-11 14:53:07 +0000
committerGlen Barber <gjb@FreeBSD.org>2015-05-11 14:53:07 +0000
commitccbf25027e00d4458c1a4e04082e86ff492fbaa1 (patch)
tree74da7c3c830320ebdb1b97e2b84267ee22e16a37 /release/tools/vmimage.subr
parent044a49cd246cba27c59907b43f7d0f52a6266e40 (diff)
downloadsrc-ccbf25027e00d4458c1a4e04082e86ff492fbaa1.tar.gz
src-ccbf25027e00d4458c1a4e04082e86ff492fbaa1.zip
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
Notes
Notes: svn path=/head/; revision=282772
Diffstat (limited to 'release/tools/vmimage.subr')
-rw-r--r--release/tools/vmimage.subr7
1 files changed, 4 insertions, 3 deletions
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index d4cfc2d19e8b..262e245b7040 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} \