From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 10 Aug 2023 10:31:22 +0000 (+0200)
Subject: Make sure the private tmpfs in bwrap() doesn't hide workspace
X-Git-Tag: v15.1~4^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffdfb3fafffcd66038d5e29bbe50dd5be6eaa4bf;p=thirdparty%2Fmkosi.git

Make sure the private tmpfs in bwrap() doesn't hide workspace

The workspace might be in /tmp so we need to make sure we mount it
first before we mount the workspace so that the workspace is on top
of the private tmpfs.
---

diff --git a/mkosi/run.py b/mkosi/run.py
index 0fdab9a52..431fb7041 100644
--- a/mkosi/run.py
+++ b/mkosi/run.py
@@ -267,6 +267,7 @@ def bwrap(
         "--ro-bind", "/var", "/var",
         "--ro-bind", "/run", "/run",
         "--bind", "/var/tmp", "/var/tmp",
+        "--tmpfs", "/tmp",
         "--bind", Path.cwd(), Path.cwd(),
         "--chdir", Path.cwd(),
         "--unshare-pid",
@@ -277,7 +278,6 @@ def bwrap(
         "--proc", "/proc",
         "--dev", "/dev",
         "--ro-bind", "/sys", "/sys",
-        "--tmpfs", "/tmp",
         "--setenv", "SYSTEMD_OFFLINE", one_zero(network),
     ]