From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 24 Feb 2023 12:33:39 +0000 (+0100)
Subject: Remove unnecessary prefix variable
X-Git-Tag: v15~314^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3ec8ffbf7af0d42ebc099a26a9bc5b08dfcb6a7;p=thirdparty%2Fmkosi.git

Remove unnecessary prefix variable
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 7bcabea05..ccf4b8a33 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -792,7 +792,6 @@ def install_unified_kernel(state: MkosiState, roothash: Optional[str]) -> None:
     if state.do_run_build_script:
         return
 
-    prefix = "boot"
 
     with complete_step("Generating combined kernel + initrd boot file…"):
         for kver, kimg in gen_kernel_images(state):
@@ -804,12 +803,12 @@ def install_unified_kernel(state: MkosiState, roothash: Optional[str]) -> None:
                 boot_count = f'+{state.root.joinpath("etc/kernel/tries").read_text().strip()}'
 
             if state.config.image_version:
-                boot_binary = state.root / prefix / f"EFI/Linux/{image_id}_{state.config.image_version}{boot_count}.efi"
+                boot_binary = state.root / f"boot/EFI/Linux/{image_id}_{state.config.image_version}{boot_count}.efi"
             elif roothash:
                 _, _, h = roothash.partition("=")
-                boot_binary = state.root / prefix / f"EFI/Linux/{image_id}-{kver}-{h}{boot_count}.efi"
+                boot_binary = state.root / f"boot/EFI/Linux/{image_id}-{kver}-{h}{boot_count}.efi"
             else:
-                boot_binary = state.root / prefix / f"EFI/Linux/{image_id}-{kver}{boot_count}.efi"
+                boot_binary = state.root / f"boot/EFI/Linux/{image_id}-{kver}{boot_count}.efi"
 
             if state.root.joinpath("etc/kernel/cmdline").exists():
                 cmdline = [state.root.joinpath("etc/kernel/cmdline").read_text().strip()]