From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 29 Jul 2024 13:58:26 +0000 (+0200)
Subject: Set $BOOT_ROOT when invoking kernel-install
X-Git-Tag: v25~380^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06ce2cb5e4cf3069a2af65599faf1dff37fbbca7;p=thirdparty%2Fmkosi.git

Set $BOOT_ROOT when invoking kernel-install

Instead of setting $SYSTEMD_XBOOTLDR_PATH and $SYSTEMD_ESP_PATH, let's
just set $BOOT_ROOT which does the same thing.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index edc9784c6..045885316 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -2311,7 +2311,7 @@ def find_entry_token(context: Context) -> str:
             ["kernel-install", "--root=/buildroot", "--json=pretty", "inspect"],
             sandbox=context.sandbox(binary="kernel-install", mounts=[Mount(context.root, "/buildroot", ro=True)]),
             stdout=subprocess.PIPE,
-            env={"SYSTEMD_ESP_PATH": "/efi", "SYSTEMD_XBOOTLDR_PATH": "/boot"},
+            env={"BOOT_ROOT": "/boot"},
         ).stdout
     )