From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 10 Mar 2024 19:27:14 +0000 (+0100)
Subject: Set $SYSTEMD_ESP_PATH and $SYSTEMD_XBOOTLDR_PATH when invoking kernel-install
X-Git-Tag: v22~21^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b91c7f3c1400ac77008c785d8199775a2aeec7b0;p=thirdparty%2Fmkosi.git

Set $SYSTEMD_ESP_PATH and $SYSTEMD_XBOOTLDR_PATH when invoking kernel-install

Just like bootctl, kernel-install looks at these environment variables
so let's make sure to set them for kernel-install as well.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index f78eb52de..771e8863a 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -2016,7 +2016,8 @@ def find_entry_token(context: Context) -> str:
 
     output = json.loads(run(["kernel-install", "--root", context.root, "--json=pretty", "inspect"],
                             sandbox=context.sandbox(options=["--ro-bind", context.root, context.root]),
-                            stdout=subprocess.PIPE).stdout)
+                            stdout=subprocess.PIPE,
+                            env={"SYSTEMD_ESP_PATH": "/efi", "SYSTEMD_XBOOTLDR_PATH": "/boot"}).stdout)
     logging.debug(json.dumps(output, indent=4))
     return cast(str, output["EntryToken"])