From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 13 Mar 2024 10:08:49 +0000 (+0100)
Subject: Pass custom environment to other verbs as well
X-Git-Tag: v22~12^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6983283077cc154e7ec8b55567b9ac4ac4ae7eff;p=thirdparty%2Fmkosi.git

Pass custom environment to other verbs as well

Let's use both the host environment and the custom env variables,
and let the custom env variables override the host ones.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index a1933866e..3ccfbb2d1 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -3569,7 +3569,7 @@ def run_shell(args: Args, config: Config) -> None:
             cmdline,
             stdin=sys.stdin,
             stdout=sys.stdout,
-            env=os.environ,
+            env=os.environ | config.environment,
             log=False,
             sandbox=config.sandbox(devices=True, network=True, relaxed=True),
         )
@@ -3601,7 +3601,7 @@ def run_systemd_tool(tool: str, args: Args, config: Config) -> None:
         ],
         stdin=sys.stdin,
         stdout=sys.stdout,
-        env=os.environ,
+        env=os.environ | config.environment,
         log=False,
         preexec_fn=become_root,
         sandbox=config.sandbox(network=True, devices=config.output_format == OutputFormat.disk, relaxed=True),
diff --git a/mkosi/burn.py b/mkosi/burn.py
index aab5c44c8..43701a407 100644
--- a/mkosi/burn.py
+++ b/mkosi/burn.py
@@ -35,7 +35,7 @@ def run_burn(args: Args, config: Config) -> None:
             cmd,
             stdin=sys.stdin,
             stdout=sys.stdout,
-            env=os.environ,
+            env=os.environ | config.environment,
             log=False,
             sandbox=config.sandbox(devices=True, network=True, relaxed=True),
         )
diff --git a/mkosi/qemu.py b/mkosi/qemu.py
index 2a54e9ac3..1ce7dbe33 100644
--- a/mkosi/qemu.py
+++ b/mkosi/qemu.py
@@ -856,7 +856,7 @@ def run_qemu(args: Args, config: Config) -> None:
             stdin=sys.stdin,
             stdout=sys.stdout,
             pass_fds=qemu_device_fds.values(),
-            env=os.environ,
+            env=os.environ | config.environment,
             log=False,
             foreground=True,
             sandbox=config.sandbox(network=True, devices=True, relaxed=True),
@@ -902,7 +902,7 @@ def run_ssh(args: Args, config: Config) -> None:
         cmd,
         stdin=sys.stdin,
         stdout=sys.stdout,
-        env=os.environ,
+        env=os.environ | config.environment,
         log=False,
         sandbox=config.sandbox(network=True, devices=True, relaxed=True),
     )
diff --git a/mkosi/vmspawn.py b/mkosi/vmspawn.py
index 8726183ac..4ec5b4709 100644
--- a/mkosi/vmspawn.py
+++ b/mkosi/vmspawn.py
@@ -107,4 +107,4 @@ def run_vmspawn(args: Args, config: Config) -> None:
 
         cmdline += [*args.cmdline, *kcl]
 
-        run(cmdline, stdin=sys.stdin, stdout=sys.stdout, env=os.environ, log=False)
+        run(cmdline, stdin=sys.stdin, stdout=sys.stdout, env=os.environ | config.environment, log=False)