Skip missing kernel images in gen_kernel_images()

And copy out the vmlinuz unconditionally again in copy_vmlinuz().

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 0091a98f741487e80953c793fe37639f3a5cc4f2..84c2589b18b02612c39f1096bf9bf3b38f4fe381 100644 (file)
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1054,6 +1054,9 @@ def gen_kernel_images(state: MkosiState) -> Iterator[tuple[str, Path]]:
         key=lambda k: GenericVersion(k.name),
         reverse=True
     ):
+        if not (kver / "vmlinuz").exists():
+            continue
+
         yield kver.name, Path("usr/lib/modules") / kver.name / "vmlinuz"
 
 
@@ -1409,9 +1412,6 @@ def copy_nspawn_settings(state: MkosiState) -> None:
 
 
 def copy_vmlinuz(state: MkosiState) -> None:
-    if state.config.bootable == ConfigFeature.disabled:
-        return
-
     if (state.staging / state.config.output_split_kernel).exists():
         return