Remove unused read_only argument from mount_overlay()

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index ebbabf111db64e924b58a8924580c2c8cba459de..b89a74ea51df8da7781f0b92965a955949e1ea89 100644 (file)
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -88,7 +88,7 @@ def mount_base_trees(state: MkosiState) -> Iterator[None]:
             else:
                 die(f"Unsupported base tree source {path}")
 
-        stack.enter_context(mount_overlay(bases, state.root, state.root, read_only=False))
+        stack.enter_context(mount_overlay(bases, state.root, state.root))
 
         yield
 
@@ -227,16 +227,16 @@ def mount_cache_overlay(state: MkosiState) -> Iterator[None]:
     with umask(~0o755):
         d.mkdir(exist_ok=True)
 
-    with mount_overlay([state.root], d, state.root, read_only=False):
+    with mount_overlay([state.root], d, state.root):
         yield
 
 
-def mount_build_overlay(state: MkosiState, read_only: bool = False) -> contextlib.AbstractContextManager[Path]:
+def mount_build_overlay(state: MkosiState) -> contextlib.AbstractContextManager[Path]:
     d = state.workspace / "build-overlay"
     if not d.is_symlink():
         with umask(~0o755):
             d.mkdir(exist_ok=True)
-    return mount_overlay([state.root], state.workspace / "build-overlay", state.root, read_only)
+    return mount_overlay([state.root], state.workspace / "build-overlay", state.root)
 
 
 def finalize_mounts(config: MkosiConfig) -> list[PathString]:
@@ -2285,7 +2285,7 @@ def mount_tools(tree: Optional[Path]) -> Iterator[None]:
         # into permission errors.
 
         tmp = stack.enter_context(tempfile.TemporaryDirectory(dir="/var/tmp"))
-        stack.enter_context(mount_overlay([Path("/etc")], Path(tmp), Path("/etc"), read_only=False))
+        stack.enter_context(mount_overlay([Path("/etc")], Path(tmp), Path("/etc")))
 
         for subdir in ("etc/pki", "etc/ssl", "etc/crypto-policies", "etc/ca-certificates"):
             if not (tree / subdir).exists():

diff --git a/mkosi/mounts.py b/mkosi/mounts.py
index b88494973b485c86db032ef5cbb4eb412137ade5..f400f29ef2f4eaef8d2179da2655c6ade790c76b 100644 (file)
--- a/mkosi/mounts.py
+++ b/mkosi/mounts.py
@@ -74,12 +74,7 @@ def mount(
 
 
 @contextlib.contextmanager
-def mount_overlay(
-    lowerdirs: Sequence[Path],
-    upperdir: Path,
-    where: Path,
-    read_only: bool = True,
-) -> Iterator[Path]:
+def mount_overlay(lowerdirs: Sequence[Path], upperdir: Path, where: Path) -> Iterator[Path]:
     with tempfile.TemporaryDirectory(dir=upperdir.parent, prefix=f"{upperdir.name}-workdir") as workdir:
         options = [f"lowerdir={lower}" for lower in lowerdirs] + [
             f"upperdir={upperdir}",
@@ -100,7 +95,7 @@ def mount_overlay(
             options.append("userxattr")
 
         try:
-            with mount("overlay", where, options=options, type="overlay", read_only=read_only):
+            with mount("overlay", where, options=options, type="overlay"):
                 yield where
         finally:
             with complete_step("Cleaning up overlayfs"):