aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xrelease/scripts/mk-vmimage.sh10
-rw-r--r--release/tools/vmimage.subr4
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