]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Always check in usr/lib/modules for the kernel image
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 19 Apr 2023 14:10:48 +0000 (16:10 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 19 Apr 2023 14:13:51 +0000 (16:13 +0200)
This helps with finding self compiled kernels that are installed
in another location than the distro default.

mkosi/__init__.py

index 11dbb173ec4ffdb5f53a1a7935eacead692a80de..b8af8694237615f81b58e02e0fe2ea47518fa74a 100644 (file)
@@ -684,7 +684,9 @@ def gen_kernel_images(state: MkosiState) -> Iterator[tuple[str, Path]]:
         key=lambda k: GenericVersion(k.name),
         reverse=True
     ):
-        kimg = state.installer.kernel_image(kver.name, state.config.architecture)
+        kimg = Path("usr/lib/modules") / kver.name / "vmlinuz"
+        if not kimg.exists():
+            kimg = state.installer.kernel_image(kver.name, state.config.architecture)
 
         yield kver.name, kimg