From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 22 Jan 2025 15:54:28 +0000 (+0100)
Subject: Simplify finalize_firmware_variables() a little
X-Git-Tag: v25~11^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03d6306231c7c2f77ffaf1edf865cd8cea7ea154;p=thirdparty%2Fmkosi.git

Simplify finalize_firmware_variables() a little
---

diff --git a/mkosi/qemu.py b/mkosi/qemu.py
index ae959cd9e..2e54b8c85 100644
--- a/mkosi/qemu.py
+++ b/mkosi/qemu.py
@@ -717,7 +717,7 @@ def finalize_firmware_variables(
     ovmf: OvmfConfig,
     stack: contextlib.ExitStack,
 ) -> tuple[Path, str]:
-    ovmf_vars = stack.enter_context(tempfile.NamedTemporaryFile(prefix="mkosi-ovmf-vars-"))
+    ovmf_vars = Path(stack.enter_context(tempfile.NamedTemporaryFile(prefix="mkosi-ovmf-vars-")).name)
     if config.firmware_variables in (None, Path("custom"), Path("microsoft")):
         ovmf_vars_format = ovmf.vars_format
     else:
@@ -729,7 +729,7 @@ def finalize_firmware_variables(
             [
                 "virt-fw-vars",
                 "--input", workdir(ovmf.vars),
-                "--output", workdir(Path(ovmf_vars.name)),
+                "--output", workdir(ovmf_vars),
                 "--enroll-cert", workdir(config.secure_boot_certificate),
                 "--add-db", "OvmfEnrollDefaultKeys", workdir(config.secure_boot_certificate),
                 "--no-microsoft",
@@ -738,7 +738,7 @@ def finalize_firmware_variables(
             ],
             sandbox=config.sandbox(
                 options=[
-                    "--bind", ovmf_vars.name, workdir(Path(ovmf_vars.name)),
+                    "--bind", ovmf_vars, workdir(ovmf_vars),
                     "--ro-bind", ovmf.vars, workdir(ovmf.vars),
                     "--ro-bind", config.secure_boot_certificate, workdir(config.secure_boot_certificate),
                 ],
@@ -750,9 +750,9 @@ def finalize_firmware_variables(
             if config.firmware_variables == Path("microsoft") or not config.firmware_variables
             else config.firmware_variables
         )
-        shutil.copy2(vars, Path(ovmf_vars.name))
+        shutil.copy2(vars, ovmf_vars)
 
-    return Path(ovmf_vars.name), ovmf_vars_format
+    return ovmf_vars, ovmf_vars_format
 
 
 def apply_runtime_size(config: Config, image: Path) -> None: