From cf648b0d28b5d583326dac27fb4652202e1d7457 Mon Sep 17 00:00:00 2001 From: Ricardo Simoes Date: Thu, 18 Jul 2024 08:46:34 +0200 Subject: [PATCH] volatile-binds: Remove workdir if OverlayFS fails To fulfill OverlayFS workdir requirements, the mount-copybind script creates a workdir. But if the mount operation fails for any reason, the workdir is left there. Then, subsequent runs of mount-copybind will again try to create the directory and pollute system logs with failed mkdir error messages. This commit mitigates the problem by unconditionally removing workdir if the OverlayFS is not used or fails to run. (From OE-Core rev: 7872edbb33024fc710ac683eaef5635b89a1b994) Signed-off-by: Ricardo Simoes Signed-off-by: Mark Jonas Signed-off-by: Richard Purdie --- meta/recipes-core/volatile-binds/files/mount-copybind | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/volatile-binds/files/mount-copybind b/meta/recipes-core/volatile-binds/files/mount-copybind index da88d160ee..4f373412be 100755 --- a/meta/recipes-core/volatile-binds/files/mount-copybind +++ b/meta/recipes-core/volatile-binds/files/mount-copybind @@ -57,6 +57,7 @@ if [ -d "$mountpoint" ]; then fi fi if [ "$MOUNT_COPYBIND_AVOID_OVERLAYFS" = 1 ] || ! mount -t overlay overlay -olowerdir="$mountpoint",upperdir="$spec",workdir="$overlay_workdir""$mountcontext" "$mountpoint" > /dev/null 2>&1; then + rm -rf "$overlay_workdir" if [ "$specdir_existed" != "yes" ]; then cp -aPR "$mountpoint"/. "$spec/"