summaryrefslogtreecommitdiffstats
path: root/release/tools
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2015-05-14 04:21:04 +0000
committergjb <gjb@FreeBSD.org>2015-05-14 04:21:04 +0000
commit677d1a06c2270f347f151f884993bc381f1bb6ff (patch)
tree16d856e1ea1e2b093c6f7ee5bf5daacca99d2750 /release/tools
parent577cf5c11f6615cdb1503ff396b7ac5da0aaee43 (diff)
downloadFreeBSD-src-677d1a06c2270f347f151f884993bc381f1bb6ff.zip
FreeBSD-src-677d1a06c2270f347f151f884993bc381f1bb6ff.tar.gz
MFC r282772:
Fix virtual machine disk format creating by passing VMFORMAT to mkimg(1) PR: 200068 Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release/tools')
-rw-r--r--release/tools/vmimage.subr5
1 files changed, 3 insertions, 2 deletions
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index 6b4bc26..dae2ee1 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -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} \
OpenPOWER on IntegriCloud