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 1ee734e1ce5562e3cc6cb4d8d8eea007a4cd25c9..48e1275af51ae0670acee6ebb5a2fa561ffa1aa4 100644 (file)
--- 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 c01d3be091ab1d76ad20d6571feb8cb37fa52f54..fc064d1a63f2401c140d219cc5016850eab3895f 100644 (file)
--- 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",
             ]