Merge pull request #959 from AkihiroSuda/dev

templates: add experimental/rocky-9
lima-vm · Jul 15, 2022 · 5825216 · 5825216
2 parents 18cb8ea + 26dd16e
commit 5825216
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/examples/README.md b/examples/README.md
@@ -37,6 +37,7 @@ Others:
 - [`vmnet.yaml`](./vmnet.yaml): ⭐enable [`vmnet.framework`](../docs/network.md)
 - [`deprecated/centos-7.yaml`](./deprecated/centos-7.yaml): [deprecated] CentOS Linux 7
 - [`experimental/almalinux-9.yaml`](experimental/almalinux-9.yaml): [experimental] AlmaLinux 9
+- [`experimental/rocky-9.yaml`](experimental/rocky-9.yaml): [experimental] Rocky Linux 9
 - [`experimental/centos-stream-9.yaml`](experimental/centos-stream-9.yaml): [experimental] CentOS Stream 9
 - [`experimental/9p.yaml`](experimental/9p.yaml): [experimental] use 9p mount type
 - [`experimental/riscv64.yaml`](experimental/riscv64.yaml): [experimental] RISC-V

diff --git a/examples/experimental/almalinux-9.yaml b/examples/experimental/almalinux-9.yaml
@@ -1,4 +1,4 @@
-# This example requires Lima v0.8.3 or later.
+# This example requires Lima v0.11.1 or later.
 
 images:
 - location: "http://repo.almalinux.org/almalinux/9.0/cloud/x86_64/images/AlmaLinux-9-GenericCloud-9.0-20220527.x86_64.qcow2"
@@ -11,9 +11,6 @@ mounts:
 - location: "~"
 - location: "/tmp/lima"
   writable: true
-firmware:
-  legacyBIOS: true
 cpuType:
-  # Workaround for "vmx_write_mem: mmu_gva_to_gpa XXXXXXXXXXXXXXXX failed" on Intel Mac
-  # https://bugs.launchpad.net/qemu/+bug/1838390
+  # Workaround for "intel_pstate: CPU model not supported"
   x86_64: "Haswell-v4"
diff --git a/examples/experimental/centos-stream-9.yaml b/examples/experimental/centos-stream-9.yaml
@@ -1,4 +1,4 @@
-# This example requires Lima v0.8.3 or later.
+# This example requires Lima v0.11.1 or later.
 
 images:
 - location: "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20220606.0.x86_64.qcow2"
@@ -12,8 +12,8 @@ mounts:
 - location: "/tmp/lima"
   writable: true
 firmware:
+  # CentOS Stream 9 still requires legacyBIOS, while AlmaLinux 9 and Rocky Linux 9 do not.
   legacyBIOS: true
 cpuType:
-  # Workaround for "vmx_write_mem: mmu_gva_to_gpa XXXXXXXXXXXXXXXX failed" on Intel Mac
-  # https://bugs.launchpad.net/qemu/+bug/1838390
+  # Workaround for "intel_pstate: CPU model not supported"
   x86_64: "Haswell-v4"
diff --git a/examples/experimental/rocky-9.yaml b/examples/experimental/rocky-9.yaml
@@ -0,0 +1,16 @@
+# This example requires Lima v0.11.1 or later.
+
+images:
+- location: "https://dl.rockylinux.org/pub/rocky/9.0/images/x86_64/Rocky-9-GenericCloud-9.0-20220706.0.x86_64.qcow2"
+  arch: "x86_64"
+  digest: "sha256:9305faad09707ab72ec8e4a7b2cdc8e20bc31b608443d6c6df954fd2f3371aa2"
+- location: "https://dl.rockylinux.org/pub/rocky/9.0/images/aarch64/Rocky-9-GenericCloud-9.0-20220706.0.aarch64.qcow2"
+  arch: "aarch64"
+  digest: "sha256:21061e421267e573c39197aaf7f4298424238dab7e7ad44f09a2b805e8d18ea5"
+mounts:
+- location: "~"
+- location: "/tmp/lima"
+  writable: true
+cpuType:
+  # For consistency with AlmaLinux 9
+  x86_64: "Haswell-v4"