]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Set $SYSTEMD_ESP_PATH and $SYSTEMD_XBOOTLDR_PATH when invoking kernel-install
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Sun, 10 Mar 2024 19:27:14 +0000 (20:27 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Sun, 10 Mar 2024 19:27:14 +0000 (20:27 +0100)
Just like bootctl, kernel-install looks at these environment variables
so let's make sure to set them for kernel-install as well.

mkosi/__init__.py

index f78eb52de78e17cacb4ec29add32f3ec0cd9cc53..771e8863a5f6d903508f5dd569775f110aa71c6a 100644 (file)
@@ -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"])