]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Use image default PATH in run_workspace_command()
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 3 Mar 2023 19:00:37 +0000 (20:00 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 3 Mar 2023 19:23:36 +0000 (20:23 +0100)
mkosi/run.py

index 1e76189c592e8cdd467fc0cb6e7efe05bcf3711c..e594771546eeebf3fca92156fef0dcab595f3fff 100644 (file)
@@ -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 $?"