Merge pull request #991 from stgraber/main

incusd/instance/edk2: Support OVMF filenames on arm64
lxc · Jul 13, 2024 · 630f2d0 · 630f2d0
2 parents b47c135 + cc33d43
commit 630f2d0
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/internal/server/instance/drivers/edk2/driver_edk2.go b/internal/server/instance/drivers/edk2/driver_edk2.go
@@ -83,9 +83,24 @@ var architectureInstallations = map[int][]Installation{
 		Usage: map[FirmwareUsage][]FirmwarePair{
 			GENERIC: {
 				{Code: "AAVMF_CODE.fd", Vars: "AAVMF_VARS.fd"},
+				{Code: "OVMF_CODE.4MB.fd", Vars: "OVMF_VARS.4MB.fd"},
+				{Code: "OVMF_CODE_4M.fd", Vars: "OVMF_VARS_4M.fd"},
+				{Code: "OVMF_CODE.4m.fd", Vars: "OVMF_VARS.4m.fd"},
+				{Code: "OVMF_CODE.2MB.fd", Vars: "OVMF_VARS.2MB.fd"},
+				{Code: "OVMF_CODE.fd", Vars: "OVMF_VARS.fd"},
+				{Code: "OVMF_CODE.fd", Vars: "qemu.nvram"},
 			},
 			SECUREBOOT: {
 				{Code: "AAVMF_CODE.ms.fd", Vars: "AAVMF_VARS.ms.fd"},
+				{Code: "OVMF_CODE.4MB.fd", Vars: "OVMF_VARS.4MB.ms.fd"},
+				{Code: "OVMF_CODE_4M.ms.fd", Vars: "OVMF_VARS_4M.ms.fd"},
+				{Code: "OVMF_CODE_4M.secboot.fd", Vars: "OVMF_VARS_4M.secboot.fd"},
+				{Code: "OVMF_CODE.secboot.4m.fd", Vars: "OVMF_VARS.4m.fd"},
+				{Code: "OVMF_CODE.secboot.fd", Vars: "OVMF_VARS.secboot.fd"},
+				{Code: "OVMF_CODE.secboot.fd", Vars: "OVMF_VARS.fd"},
+				{Code: "OVMF_CODE.2MB.fd", Vars: "OVMF_VARS.2MB.ms.fd"},
+				{Code: "OVMF_CODE.fd", Vars: "OVMF_VARS.ms.fd"},
+				{Code: "OVMF_CODE.fd", Vars: "qemu.nvram"},
 			},
 		},
 	}},