diff options
| author | Mitchell Horne <mhorne@FreeBSD.org> | 2020-10-30 18:20:52 +0000 |
|---|---|---|
| committer | Mitchell Horne <mhorne@FreeBSD.org> | 2020-10-30 18:20:52 +0000 |
| commit | 1d76e25a67dc33464428bba05d28ac98a71ea47c (patch) | |
| tree | d4e3fda0430a51be628ce9cb69a78bc1eef7eab7 /release | |
| parent | 0d51f9e58981094b27753669aa8311d4ab157868 (diff) | |
Notes
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 1f4d40ce913f..bec191e9f55d 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 |