]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Add opensuse paths to qemu search locations 2196/head
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Thu, 21 Dec 2023 13:21:52 +0000 (14:21 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Thu, 21 Dec 2023 13:21:52 +0000 (14:21 +0100)
mkosi/qemu.py

index dfbeff34e3534faa0c46ae52dd9a988c1f47590d..b220e075fe7d423c1bb9e8994846f6329a0c3b0f 100644 (file)
@@ -166,7 +166,10 @@ def find_qemu_binary(config: MkosiConfig) -> str:
 
 def find_ovmf_firmware(config: MkosiConfig) -> tuple[Path, bool]:
     FIRMWARE_LOCATIONS = {
-        Architecture.x86_64: ["/usr/share/ovmf/x64/OVMF_CODE.secboot.fd"],
+        Architecture.x86_64: [
+            "/usr/share/ovmf/x64/OVMF_CODE.secboot.fd",
+            "/usr/share/qemu/ovmf-x86_64.smm.bin",
+        ],
         Architecture.x86: [
             "/usr/share/edk2/ovmf-ia32/OVMF_CODE.secboot.fd",
             "/usr/share/OVMF/OVMF32_CODE_4M.secboot.fd"
@@ -229,7 +232,10 @@ def find_ovmf_vars(config: MkosiConfig) -> Path:
     OVMF_VARS_LOCATIONS = []
 
     if config.architecture == Architecture.x86_64:
-        OVMF_VARS_LOCATIONS += ["/usr/share/ovmf/x64/OVMF_VARS.fd"]
+        OVMF_VARS_LOCATIONS += [
+            "/usr/share/ovmf/x64/OVMF_VARS.fd",
+            "/usr/share/qemu/ovmf-x86_64-vars.bin",
+        ]
     elif config.architecture == Architecture.x86:
         OVMF_VARS_LOCATIONS += [
             "/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd",