diff mbox series

[1/2] volatile-binds: Do not create workdir if OverlayFS is disabled

Message ID 20240718064634.7276-2-mark.jonas@de.bosch.com
State Accepted, archived
Commit 323765607f262b5fea0f19e8a05aeffe5076235a
Headers show
Series volatile-binds: Mitigate workdir cleanup issues | expand

Commit Message

Jonas Mark (BT-FS/ENG1-GRB) July 18, 2024, 6:46 a.m. UTC 
From: Ricardo Simoes <ricardo.simoes@pt.bosch.com>

When the mountpoint parameter is a directory, the mount-copybind will
first try to use OverlayFS. Because of that, it needs to create the
OverlayFS workdir (determined by the overlay_workdir).

But if the environment variable MOUNT_COPYBIND_AVOID_OVERLAYFS is set
to "1", the script uses bind mount. In that case, the overlay_workdir
is useless, leaving the spec parent directory in a dirty state.

This commit changes mount-copybind so that the overlay_workdir is only
created when MOUNT_COPYBIND_AVOID_OVERLAYFS is not set to 1.

Signed-off-by: Ricardo Simoes <ricardo.simoes@pt.bosch.com>
Signed-off-by: Mark Jonas <mark.jonas@de.bosch.com>
---
 meta/recipes-core/volatile-binds/files/mount-copybind | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta/recipes-core/volatile-binds/files/mount-copybind b/meta/recipes-core/volatile-binds/files/mount-copybind
index ddc4357615..da88d160ee 100755
--- a/meta/recipes-core/volatile-binds/files/mount-copybind
+++ b/meta/recipes-core/volatile-binds/files/mount-copybind
@@ -45,7 +45,9 @@  if [ -d "$mountpoint" ]; then
 
     # Fast version of calculating `dirname ${spec}`/.`basename ${spec}`-work
     overlay_workdir="${spec%/*}/.${spec##*/}-work"
-    mkdir "${overlay_workdir}"
+    if [ "$MOUNT_COPYBIND_AVOID_OVERLAYFS" != 1 ]; then
+        mkdir "${overlay_workdir}"
+    fi
 
     # Try to mount using overlay, which is must faster than copying files.
     # If that fails, fall back to slower copy.