Add more ovmf locations

debian removed their old variables in favor of new ones so let's
make sure we look for the new ones as well.

diff --git a/mkosi/qemu.py b/mkosi/qemu.py
index 83428c9c024e1e7f4345a42a4661f2fb0a4eaea9..328bc4bc111658d71d3383fc1d6a4c5ebc6bd5ed 100644 (file)
--- a/mkosi/qemu.py
+++ b/mkosi/qemu.py
@@ -204,6 +204,7 @@ def find_ovmf_firmware(config: MkosiConfig) -> tuple[Path, bool]:
         "/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd",
         "/usr/share/qemu/OVMF_CODE.secboot.fd",
         "/usr/share/ovmf/OVMF.secboot.fd",
+        "/usr/share/OVMF/OVMF_CODE_4M.secboot.fd",
         "/usr/share/OVMF/OVMF_CODE.secboot.fd",
     ]
 
@@ -216,6 +217,7 @@ def find_ovmf_firmware(config: MkosiConfig) -> tuple[Path, bool]:
         "/usr/share/edk2-ovmf/OVMF_CODE.fd",
         "/usr/share/qemu/OVMF_CODE.fd",
         "/usr/share/ovmf/OVMF.fd",
+        "/usr/share/OVMF/OVMF_CODE_4M.fd",
         "/usr/share/OVMF/OVMF_CODE.fd",
     ]
 
@@ -246,11 +248,14 @@ def find_ovmf_vars(config: MkosiConfig) -> Path:
     elif config.architecture == Architecture.arm64:
         OVMF_VARS_LOCATIONS += ["/usr/share/AAVMF/AAVMF_VARS.fd"]
 
-    OVMF_VARS_LOCATIONS += ["/usr/share/edk2/ovmf/OVMF_VARS.fd",
-                            "/usr/share/edk2-ovmf/OVMF_VARS.fd",
-                            "/usr/share/qemu/OVMF_VARS.fd",
-                            "/usr/share/ovmf/OVMF_VARS.fd",
-                            "/usr/share/OVMF/OVMF_VARS.fd"]
+    OVMF_VARS_LOCATIONS += [
+        "/usr/share/edk2/ovmf/OVMF_VARS.fd",
+        "/usr/share/edk2-ovmf/OVMF_VARS.fd",
+        "/usr/share/qemu/OVMF_VARS.fd",
+        "/usr/share/ovmf/OVMF_VARS.fd",
+        "/usr/share/OVMF/OVMF_VARS_4M.fd",
+        "/usr/share/OVMF/OVMF_VARS.fd",
+    ]
 
     for location in OVMF_VARS_LOCATIONS:
         if os.path.exists(location):