]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Remove unnecessary prefix variable
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 24 Feb 2023 12:33:39 +0000 (13:33 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 24 Feb 2023 12:33:39 +0000 (13:33 +0100)
mkosi/__init__.py

index 7bcabea05fa2b902daa4acb9a0af0639ea306464..ccf4b8a3335992e23191e8ff610628f3dd1d48ab 100644 (file)
@@ -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()]