From: DaanDeMeyer <daan.j.demeyer@gmail.com>
Date: Fri, 22 Aug 2025 13:58:18 +0000 (+0200)
Subject: Stop passing --workspace-dir= in mkosi-initrd and mkosi-addon
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3869%2Fhead;p=thirdparty%2Fmkosi.git

Stop passing --workspace-dir= in mkosi-initrd and mkosi-addon

The default value when running as root is /var/tmp now so there's no
need to specify --workspace-dir= explicitly anymore. This allows the
workspace directory to be changed in the configuration file in
/etc/mkosi-initrd and /etc/mkosi-addon.

Fixes #3852
---

diff --git a/mkosi/addon.py b/mkosi/addon.py
index 1ee734e1c..48e1275af 100644
--- a/mkosi/addon.py
+++ b/mkosi/addon.py
@@ -66,10 +66,7 @@ def main() -> None:
             cmdline += ["--debug-sandbox"]
 
         if os.getuid() == 0:
-            cmdline += [
-                "--workspace-dir=/var/tmp",
-                "--output-mode=600",
-            ]
+            cmdline += ["--output-mode=600"]
 
         cmdline += include_system_config("mkosi-addon")
         cmdline += process_crypttab(Path(staging_dir))
diff --git a/mkosi/initrd.py b/mkosi/initrd.py
index c01d3be09..fc064d1a6 100644
--- a/mkosi/initrd.py
+++ b/mkosi/initrd.py
@@ -374,7 +374,6 @@ def main() -> None:
 
         if os.getuid() == 0:
             cmdline += [
-                "--workspace-dir=/var/tmp",
                 "--package-cache-dir=/var",
                 "--cache-only=metadata",
             ]