From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 6 Sep 2024 08:32:08 +0000 (+0200)
Subject: Only mount /etc/ld.so.cache if not relaxed or mountpoint available
X-Git-Tag: v25~309^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2176273cb827a2453ff058368372558c04d5349;p=thirdparty%2Fmkosi.git

Only mount /etc/ld.so.cache if not relaxed or mountpoint available

While we're at it, move all the tools related stuff together in
sandbox_cmd().
---

diff --git a/mkosi/run.py b/mkosi/run.py
index 7411b2245..6bcc2a8a5 100644
--- a/mkosi/run.py
+++ b/mkosi/run.py
@@ -470,17 +470,28 @@ def sandbox_cmd(
     else:
         cmdline += ["--ro-bind", tools / "usr", "/usr"]
 
-    if (tools / "etc/ld.so.cache").exists():
-        cmdline += ["--ro-bind", tools / "etc/ld.so.cache", "/etc/ld.so.cache"]
+    for d in ("bin", "sbin", "lib", "lib32", "lib64"):
+        if (p := tools / d).is_symlink():
+            cmdline += ["--symlink", p.readlink(), Path("/") / p.relative_to(tools)]
+        elif p.is_dir():
+            cmdline += ["--ro-bind", p, Path("/") / p.relative_to(tools)]
+
+    # If we're using /usr from a tools tree, we have to use /etc/alternatives and /etc/ld.so.cache from the tools tree
+    # as well if they exists since those are directly related  to /usr. In relaxed mode, we only do this if
+    # the mountpoint already exists on the host as otherwise we'd modify the host's /etc by creating the mountpoint
+    # ourselves (or fail when trying to create it).
+    for p in (Path("etc/alternatives"), Path("etc/ld.so.cache")):
+        if (tools / p).exists() and (not relaxed or (Path("/") / p).exists()):
+            cmdline += ["--ro-bind", tools / p, Path("/") / p]
+
+    if (tools / "nix/store").exists():
+        cmdline += ["--bind", tools / "nix/store", "/nix/store"]
 
     if relaxed:
         cmdline += ["--bind", "/tmp", "/tmp"]
     else:
         cmdline += ["--dir", "/tmp", "--dir", "/var/tmp", "--unshare-ipc"]
 
-    if (tools / "nix/store").exists():
-        cmdline += ["--bind", tools / "nix/store", "/nix/store"]
-
     if devices or relaxed:
         cmdline += [
             "--bind", "/sys", "/sys",
@@ -515,24 +526,10 @@ def sandbox_cmd(
         if d and not any(Path(d).is_relative_to(dir) for dir in (*dirs, "/usr", "/nix", "/tmp")):
             cmdline += ["--bind", d, d]
 
-    for d in ("bin", "sbin", "lib", "lib32", "lib64"):
-        if (p := tools / d).is_symlink():
-            cmdline += ["--symlink", p.readlink(), Path("/") / p.relative_to(tools)]
-        elif p.is_dir():
-            cmdline += ["--ro-bind", p, Path("/") / p.relative_to(tools)]
-
     path = "/usr/bin:/usr/sbin" if tools != Path("/") else os.environ["PATH"]
 
     cmdline += ["--setenv", "PATH", f"/scripts:{path}", *options]
 
-    # If we're using /usr from a tools tree, we have to use /etc/alternatives from the tools tree as well if it
-    # exists since that points directly back to /usr. Apply this after the options so the caller can mount
-    # something else to /etc without overriding this mount. In relaxed mode, we only do this if /etc/alternatives
-    # already exists on the host as otherwise we'd modify the host's /etc by creating the mountpoint ourselves (or
-    # fail when trying to create it).
-    if (tools / "etc/alternatives").exists() and (not relaxed or Path("/etc/alternatives").exists()):
-        cmdline += ["--ro-bind", tools / "etc/alternatives", "/etc/alternatives"]
-
     if scripts:
         cmdline += ["--ro-bind", scripts, "/scripts"]