Merge pull request #1033 from stgraber/main

Tweak EDK2 paths
lxc · Jul 22, 2024 · 2514d33 · 2514d33
2 parents b7f6136 + 09cb825
commit 2514d33
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/internal/server/instance/drivers/edk2/driver_edk2.go b/internal/server/instance/drivers/edk2/driver_edk2.go
@@ -57,7 +57,6 @@ var architectureInstallations = map[int][]Installation{
 				{Code: "OVMF_CODE.fd", Vars: "qemu.nvram"},
 			},
 			CSM: {
-				{Code: "seabios.bin", Vars: "seabios.bin"},
 				{Code: "OVMF_CODE.4MB.CSM.fd", Vars: "OVMF_VARS.4MB.CSM.fd"},
 				{Code: "OVMF_CODE.csm.4m.fd", Vars: "OVMF_VARS.4m.fd"},
 				{Code: "OVMF_CODE.2MB.CSM.fd", Vars: "OVMF_VARS.2MB.CSM.fd"},
@@ -69,6 +68,7 @@ var architectureInstallations = map[int][]Installation{
 		Path: "/usr/share/qemu",
 		Usage: map[FirmwareUsage][]FirmwarePair{
 			GENERIC: {
+				{Code: "seabios.bin", Vars: "seabios.bin"},
 				{Code: "ovmf-x86_64-4m-code.bin", Vars: "ovmf-x86_64-4m-vars.bin"},
 				{Code: "ovmf-x86_64.bin", Vars: "ovmf-x86_64-code.bin"},
 			},
@@ -77,6 +77,22 @@ var architectureInstallations = map[int][]Installation{
 				{Code: "ovmf-x86_64-ms-code.bin", Vars: "ovmf-x86_64-ms-vars.bin"},
 			},
 		},
+	}, {
+		Path: "/usr/share/OVMF/x64",
+		Usage: map[FirmwareUsage][]FirmwarePair{
+			GENERIC: {
+				{Code: "OVMF_CODE.4m.fd", Vars: "OVMF_VARS.4m.fd"},
+				{Code: "OVMF_CODE.fd", Vars: "OVMF_VARS.fd"},
+			},
+			CSM: {
+				{Code: "OVMF_CODE.csm.4m.fd", Vars: "OVMF_VARS.4m.fd"},
+				{Code: "OVMF_CODE.csm.fd", Vars: "OVMF_VARS.fd"},
+			},
+			SECUREBOOT: {
+				{Code: "OVMF_CODE.secboot.4m.fd", Vars: "OVMF_VARS.4m.fd"},
+				{Code: "OVMF_CODE.secboot.fd", Vars: "OVMF_VARS.fd"},
+			},
+		},
 	}},
 	osarch.ARCH_64BIT_ARMV8_LITTLE_ENDIAN: {{
 		Path: "/usr/share/AAVMF",

diff --git a/test/suites/config.sh b/test/suites/config.sh
@@ -317,13 +317,12 @@ test_property() {
 
   # Create a snap of the instance to set its expiration timestamp
   incus snapshot create foo s1
-  incus config set foo/s1 expires_at="2024-03-23T17:38:37.753398689-04:00" --property
-  incus config get foo/s1 expires_at --property | grep -q "2024-03-23 17:38:37.753398689 -0400 -0400"
-  incus config show foo/s1 | grep -q "expires_at: 2024-03-23T17:38:37.753398689-04:00"
+  incus config set foo/s1 expires_at="2050-01-01T10:10:10.753398689-04:00" --property
+  incus config get foo/s1 expires_at --property | grep -q "2050-01-01 10:10:10.753398689 -0400 -0400"
+  incus config show foo/s1 | grep -q "expires_at: 2050-01-01T10:10:10.753398689-04:00"
   incus config unset foo/s1 expires_at --property
   incus config show foo/s1 | grep -q "expires_at: 0001-01-01T00:00:00Z"
 
-
   # Create a storage volume, create a volume snapshot and set its expiration timestamp
   # shellcheck disable=2039,3043
   local storage_pool