From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 3 Mar 2023 19:00:37 +0000 (+0100)
Subject: Use image default PATH in run_workspace_command()
X-Git-Tag: v15~311^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47ce7168847bc08f2fd3fe8fb444b6f79d92f18c;p=thirdparty%2Fmkosi.git

Use image default PATH in run_workspace_command()
---

diff --git a/mkosi/run.py b/mkosi/run.py
index 1e76189c5..e59477154 100644
--- a/mkosi/run.py
+++ b/mkosi/run.py
@@ -213,6 +213,9 @@ def run(
         LANG="C.UTF-8",
     ) | env
 
+    if env["PATH"] == "":
+        del env["PATH"]
+
     try:
         return subprocess.run(cmdline, check=check, stdout=stdout, stderr=stderr, env=env, **kwargs,
                               preexec_fn=foreground)
@@ -318,6 +321,8 @@ def run_workspace_command(
         container="mkosi",
         SYSTEMD_OFFLINE=str(int(network)),
         HOME="/",
+        # Make sure the default PATH of the distro shell is used.
+        PATH="",
     ) | env | state.environment
 
     template = "chmod 1777 /tmp /var/tmp /dev/shm && exec {} || exit $?"