From: Blair Bonnett <blair.bonnett@gmail.com>
Date: Tue, 29 Aug 2023 13:22:19 +0000 (+0200)
Subject: Move mount options into original declaration.
X-Git-Tag: v16~31^2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1844%2Fhead;p=thirdparty%2Fmkosi.git

Move mount options into original declaration.
---

diff --git a/mkosi/mounts.py b/mkosi/mounts.py
index a026a41da..0a5e5fc4a 100644
--- a/mkosi/mounts.py
+++ b/mkosi/mounts.py
@@ -81,16 +81,19 @@ def mount_overlay(
     read_only: bool = True,
 ) -> 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}", f"workdir={workdir}"]
-
-        # Disable the inodes index and metacopy (only copy metadata upwards if possible)
-        # options. If these are enabled (e.g., if the kernel enables them by default),
-        # the mount will fail if the upper directory has been earlier used with a different
-        # lower directory, such as with a build overlay that was generated on top of a
-        # different temporary root.
-        # See https://www.kernel.org/doc/html/latest/filesystems/overlayfs.html#sharing-and-copying-layers
-        # and https://github.com/systemd/mkosi/issues/1841.
-        options.extend(["index=off", "metacopy=off"])
+        options = [f"lowerdir={lower}" for lower in lowerdirs] + [
+            f"upperdir={upperdir}",
+            f"workdir={workdir}",
+            # Disable the inodes index and metacopy (only copy metadata upwards if possible)
+            # options. If these are enabled (e.g., if the kernel enables them by default),
+            # the mount will fail if the upper directory has been earlier used with a different
+            # lower directory, such as with a build overlay that was generated on top of a
+            # different temporary root.
+            # See https://www.kernel.org/doc/html/latest/filesystems/overlayfs.html#sharing-and-copying-layers
+            # and https://github.com/systemd/mkosi/issues/1841.
+            "index=off",
+            "metacopy=off"
+        ]
 
         # userxattr is only supported on overlayfs since kernel 5.11
         if GenericVersion(platform.release()) >= GenericVersion("5.11"):