From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 3 Apr 2024 18:29:40 +0000 (+0200)
Subject: Pick up SYSTEMD_LOG_LOCATION from environment as well
X-Git-Tag: v23~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ffece7756c2f3d79fba6320840de6f23019e078;p=thirdparty%2Fmkosi.git

Pick up SYSTEMD_LOG_LOCATION from environment as well

Helps with debugging errors in systemd sometimes.
---

diff --git a/mkosi/run.py b/mkosi/run.py
index 30241275f..a3b5364ef 100644
--- a/mkosi/run.py
+++ b/mkosi/run.py
@@ -172,8 +172,9 @@ def run(
     if "TMPDIR" in os.environ:
         env["TMPDIR"] = os.environ["TMPDIR"]
 
-    if "SYSTEMD_LOG_LEVEL" in os.environ:
-        env["SYSTEMD_LOG_LEVEL"] = os.environ["SYSTEMD_LOG_LEVEL"]
+    for e in ("SYSTEMD_LOG_LEVEL", "SYSTEMD_LOG_LOCATION"):
+        if e in os.environ:
+            env[e] = os.environ[e]
 
     if "HOME" not in env:
         env["HOME"] = "/"
@@ -281,8 +282,9 @@ def spawn(
     if "TMPDIR" in os.environ:
         env["TMPDIR"] = os.environ["TMPDIR"]
 
-    if "SYSTEMD_LOG_LEVEL" in os.environ:
-        env["SYSTEMD_LOG_LEVEL"] = os.environ["SYSTEMD_LOG_LEVEL"]
+    for e in ("SYSTEMD_LOG_LEVEL", "SYSTEMD_LOG_LOCATION"):
+        if e in os.environ:
+            env[e] = os.environ[e]
 
     if "HOME" not in env:
         env["HOME"] = "/"