From: Marius Schiffer <marius.schiffer@emteria.com>
Date: Mon, 19 Jun 2023 09:48:25 +0000 (+0000)
Subject: Add kernel version to UKI name for versioned images
X-Git-Tag: v15~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68d66d59f131fbb12ed0f9be2d540c1366d4b48c;p=thirdparty%2Fmkosi.git

Add kernel version to UKI name for versioned images
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 710088867..c7dbfab65 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -878,7 +878,7 @@ 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 / f"efi/EFI/Linux/{image_id}_{state.config.image_version}{boot_count}.efi"
+                boot_binary = state.root / f"efi/EFI/Linux/{image_id}_{state.config.image_version}-{kver}{boot_count}.efi"
             elif roothash:
                 _, _, h = roothash.partition("=")
                 boot_binary = state.root / f"efi/EFI/Linux/{image_id}-{kver}-{h}{boot_count}.efi"