]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Look for vmlinuz.efi as well
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Mon, 11 Dec 2023 22:53:43 +0000 (23:53 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Tue, 12 Dec 2023 09:37:52 +0000 (10:37 +0100)
On aarch64, vmlinuz.efi is installed instead of vmlinuz so let's
make sure we look for both.

mkosi/__init__.py

index a5c02695e4ff6b5c62774839c75bfaf9f1f320b3..83f7818dc2ad6ce717d1f5425246090a7b47d8fa 100644 (file)
@@ -1086,7 +1086,7 @@ def prepare_grub_bios(state: MkosiState, partitions: Sequence[Partition]) -> Non
             kmods = build_kernel_modules_initrd(state, kver)
 
             with umask(~0o600):
-                kimg = Path(shutil.copy2(state.root / kimg, kdst / "vmlinuz"))
+                kimg = Path(shutil.copy2(state.root / kimg, kdst / kimg.name))
                 initrds = [Path(shutil.copy2(microcode, kdst / "microcode"))] if microcode else []
                 initrds += [
                     Path(shutil.copy2(initrd, dst / initrd.name))
@@ -1268,10 +1268,13 @@ def gen_kernel_images(state: MkosiState) -> Iterator[tuple[str, Path]]:
         key=lambda k: GenericVersion(k.name),
         reverse=True
     ):
-        if not (kver / "vmlinuz").exists():
+        for f in ("vmlinuz", "vmlinuz.efi"):
+            if (kver / f).exists():
+                break
+        else:
             continue
 
-        yield kver.name, Path("usr/lib/modules") / kver.name / "vmlinuz"
+        yield kver.name, Path("usr/lib/modules") / kver.name / f
 
 
 def build_initrd(state: MkosiState) -> Path: