Author: mhorne
Date: Mon Nov 16 17:44:34 2020
New Revision: 367731
URL: https://svnweb.freebsd.org/changeset/base/367731

Log:
  MFC r367177:
  arm64: convert virtual machine images to GPT

Modified:
  stable/12/release/scripts/mk-vmimage.sh
  stable/12/release/tools/vmimage.subr
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/release/scripts/mk-vmimage.sh
==============================================================================
--- stable/12/release/scripts/mk-vmimage.sh     Mon Nov 16 17:42:22 2020        
(r367730)
+++ stable/12/release/scripts/mk-vmimage.sh     Mon Nov 16 17:44:34 2020        
(r367731)
@@ -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

Modified: stable/12/release/tools/vmimage.subr
==============================================================================
--- stable/12/release/tools/vmimage.subr        Mon Nov 16 17:42:22 2020        
(r367730)
+++ stable/12/release/tools/vmimage.subr        Mon Nov 16 17:44:34 2020        
(r367731)
@@ -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
_______________________________________________
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"

Reply via email to