Always mount in /usr/share/factory from the host in relaxed sandbox

If we're using /etc from the host, also use /usr/share/factory from
the host to account for symlinks from /etc into /usr/share/factory.

diff --git a/mkosi/run.py b/mkosi/run.py
index 7dbeba096ed5cb3d0e2638b3fb7da38de5bac1cd..549f076a4680f0c701dd9309fac303cf635e7839 100644 (file)
--- a/mkosi/run.py
+++ b/mkosi/run.py
@@ -537,6 +537,11 @@ def sandbox_cmd(
                 else:
                     cmdline += ["--bind", p, p]
 
+            # /etc might be full of symlinks to /usr/share/factory, so make sure we use /usr/share/factory
+            # from the host and not from the tools tree.
+            if tools != Path("/") and (factory := Path("/usr/share/factory")).exists():
+                cmdline += ["--bind", factory, factory]
+
         if home := current_home_dir():
             cmdline += ["--bind", home, home]
     else: