Author: mhorne
Date: Mon Nov 16 17:41:05 2020
New Revision: 367729
URL: https://svnweb.freebsd.org/changeset/base/367729
Log:
MFC r367175:
Slight refactor in vmimage.subr
Modified:
stable/12/release/tools/vmimage.subr
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/release/tools/vmimage.subr
==============================================================================
--- stable/12/release/tools/vmimage.subr Mon Nov 16 17:20:35 2020
(r367728)
+++ stable/12/release/tools/vmimage.subr Mon Nov 16 17:41:05 2020
(r367729)
@@ -21,32 +21,39 @@ write_partition_layout() {
case "${TARGET}:${TARGET_ARCH}" in
amd64:amd64 | i386:i386)
- mkimg -s gpt -f ${VMFORMAT} \
- -b ${BOOTFILES}/i386/pmbr/pmbr \
- -p
freebsd-boot/bootfs:=${BOOTFILES}/i386/gptboot/gptboot \
- -p efi:=${BOOTFILES}/efi/boot1/boot1.efifat \
- ${SWAPOPT} \
- -p freebsd-ufs/rootfs:=${VMBASE} \
- -o ${VMIMAGE}
+ ESP=yes
+ SCHEME=gpt
+ BOOTPARTS="-b ${BOOTFILES}/i386/pmbr/pmbr \
+ -p
freebsd-boot/bootfs:=${BOOTFILES}/i386/gptboot/gptboot"
+ ROOTFSPART="-p freebsd-ufs/rootfs:=${VMBASE}"
;;
arm64:aarch64)
- mkimg -s mbr -f ${VMFORMAT} \
- -p efi:=${BOOTFILES}/efi/boot1/boot1.efifat \
- -p freebsd:=${VMBASE} \
- -o ${VMIMAGE}
+ ESP=yes
+ SCHEME=mbr
+ BOOTPARTS=
+ ROOTFSPART="-p freebsd:=${VMBASE}"
;;
powerpc:powerpc*)
- mkimg -s apm -f ${VMFORMAT} \
- -p
apple-boot/bootfs:=${BOOTFILES}/powerpc/boot1.chrp/boot1.hfs \
- ${SWAPOPT} \
- -p freebsd-ufs/rootfs:=${VMBASE} \
- -o ${VMIMAGE}
+ ESP=no
+ SCHEME=apm
+ BOOTPARTS="-p
apple-boot/bootfs:=${BOOTFILES}/powerpc/boot1.chrp/boot1.hfs"
+ ROOTFSPART="-p freebsd-ufs/rootfs:=${VMBASE}"
;;
*)
# ENOTSUPP
return 1
;;
esac
+
+ if [ ${ESP} = "yes" ]; then
+ BOOTPARTS="${BOOTPARTS} -p
efi:=${BOOTFILES}/efi/boot1/boot1.efifat"
+ fi
+
+ mkimg -s ${SCHEME} -f ${VMFORMAT} \
+ ${BOOTPARTS} \
+ ${SWAPOPT} \
+ ${ROOTFSPART} \
+ -o ${VMIMAGE}
return 0
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
