From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 19 Apr 2023 19:39:07 +0000 (+0200)
Subject: Fail with a clear error if sd-stub is not installed in the image
X-Git-Tag: v15~228
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09ba256ee0369569c8ccba2bea6ab35c2378ce77;p=thirdparty%2Fmkosi.git

Fail with a clear error if sd-stub is not installed in the image
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 36d363279..468a78180 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -766,11 +766,15 @@ def install_unified_kernel(state: MkosiState, roothash: Optional[str]) -> None:
             # nul terminators in argv so let's communicate the cmdline via a file instead.
             state.workspace.joinpath("cmdline").write_text(f"{' '.join(cmdline).strip()}\x00")
 
+            stub = state.root / f"lib/systemd/boot/efi/linux{EFI_ARCHITECTURES[state.config.architecture]}.efi.stub"
+            if not stub.exists():
+                die(f"sd-stub not found at {stub.relative_to(state.root)}")
+
             cmd: list[PathString] = [
                 shutil.which("ukify") or "/usr/lib/systemd/ukify",
                 "--cmdline", f"@{state.workspace / 'cmdline'}",
                 "--os-release", f"@{state.root / 'usr/lib/os-release'}",
-                "--stub", state.root / f"lib/systemd/boot/efi/linux{EFI_ARCHITECTURES[state.config.architecture]}.efi.stub",
+                "--stub", stub,
                 "--output", boot_binary,
                 "--efi-arch", EFI_ARCHITECTURES[state.config.architecture],
             ]