diff options
author | mhorne <mhorne@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f> | 2020-10-30 18:20:52 +0000 |
---|---|---|
committer | mhorne <mhorne@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f> | 2020-10-30 18:20:52 +0000 |
commit | 246a962670ec39cf5a62f75e695c90cbd81cc070 (patch) | |
tree | d4e3fda0430a51be628ce9cb69a78bc1eef7eab7 | |
parent | 3b6949072e7e55a2516969d511d3749dc32fa812 (diff) | |
download | freebsd-246a962670ec39cf5a62f75e695c90cbd81cc070.tar.gz freebsd-246a962670ec39cf5a62f75e695c90cbd81cc070.tar.bz2 |
arm64: convert virtual machine images to GPT
These images were switched to MBR in r281876 as a way to cope with a
hard-coded partition GUID in QEMU's default EFI firmware. Enough time
has passed that this is no longer a problem; QEMU versions >= 4.0
include a copy of edk2 EFI firmware that can detect the root filesystem
properly. Alternatively, sysutils/u-boot-qemu-arm64 can be used.
Switch back to building these images with a GPT partition table, and
re-enable the swap partition.
Reviewed by: gjb, emaste
MFC after: 2 weeks
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D26986
git-svn-id: http://svn.freebsd.org/base/head@367177 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
-rwxr-xr-x | release/scripts/mk-vmimage.sh | 10 | ||||
-rw-r--r-- | release/tools/vmimage.subr | 4 |
2 files changed, 3 insertions, 11 deletions
diff --git a/release/scripts/mk-vmimage.sh b/release/scripts/mk-vmimage.sh index fd84216a99f..cf795e04655 100755 --- a/release/scripts/mk-vmimage.sh +++ b/release/scripts/mk-vmimage.sh @@ -93,15 +93,7 @@ main() { . "${VMCONFIG}" fi - case ${TARGET}:${TARGET_ARCH} in - arm64:aarch64) - ROOTLABEL="ufs" - NOSWAP=1 - ;; - *) - ROOTLABEL="gpt" - ;; - esac + ROOTLABEL="gpt" vm_create_base vm_install_base diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 1f4d40ce913..bec191e9f55 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -32,9 +32,9 @@ write_partition_layout() { ;; arm64:aarch64) ESP=yes - SCHEME=mbr + SCHEME=gpt BOOTPARTS= - ROOTFSPART="-p freebsd:=${VMBASE}" + ROOTFSPART="-p freebsd-ufs/rootfs:=${VMBASE}" ;; powerpc:powerpc*) ESP=no |