diff options
| author | Mitchell Horne <mhorne@FreeBSD.org> | 2020-11-16 17:44:34 +0000 |
|---|---|---|
| committer | Mitchell Horne <mhorne@FreeBSD.org> | 2020-11-16 17:44:34 +0000 |
| commit | f4c348d2a163dd05158425885547406991f86b04 (patch) | |
| tree | 9d8cb8ab7cc3c4f8057b26a648df7e9c719692c9 /release | |
| parent | 1463eac6f22855f553b31e2f88fb639d47f8bd83 (diff) | |
| download | src-f4c348d2a163dd05158425885547406991f86b04.tar.gz src-f4c348d2a163dd05158425885547406991f86b04.zip | |
MFC r367177:
arm64: convert virtual machine images to GPT
Notes
Notes:
svn path=/stable/12/; revision=367731
Diffstat (limited to 'release')
| -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 fd84216a99fe..cf795e04655b 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 76da8eea90c3..f4c2918fe374 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -29,9 +29,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 |