diff options
Diffstat (limited to 'meta/recipes-core/volatile-binds')
-rwxr-xr-x | meta/recipes-core/volatile-binds/files/mount-copybind | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-core/volatile-binds/files/mount-copybind b/meta/recipes-core/volatile-binds/files/mount-copybind index 8bbb406b3a..ddc4357615 100755 --- a/meta/recipes-core/volatile-binds/files/mount-copybind +++ b/meta/recipes-core/volatile-binds/files/mount-copybind | |||
@@ -2,6 +2,9 @@ | |||
2 | # | 2 | # |
3 | # Perform a bind mount, copying existing files as we do so to ensure the | 3 | # Perform a bind mount, copying existing files as we do so to ensure the |
4 | # overlaid path has the necessary content. | 4 | # overlaid path has the necessary content. |
5 | # If the target is a directory and overlayfs is available (and the environment | ||
6 | # variable MOUNT_COPYBIND_AVOID_OVERLAYFS=1 is not set), then an overlay mount | ||
7 | # will be attempted first. | ||
5 | 8 | ||
6 | if [ $# -lt 2 ]; then | 9 | if [ $# -lt 2 ]; then |
7 | echo >&2 "Usage: $0 spec mountpoint [OPTIONS]" | 10 | echo >&2 "Usage: $0 spec mountpoint [OPTIONS]" |
@@ -51,7 +54,7 @@ if [ -d "$mountpoint" ]; then | |||
51 | mountcontext=",rootcontext=$(matchpathcon -n "$mountpoint")" | 54 | mountcontext=",rootcontext=$(matchpathcon -n "$mountpoint")" |
52 | fi | 55 | fi |
53 | fi | 56 | fi |
54 | if ! mount -t overlay overlay -olowerdir="$mountpoint",upperdir="$spec",workdir="$overlay_workdir""$mountcontext" "$mountpoint" > /dev/null 2>&1; then | 57 | if [ "$MOUNT_COPYBIND_AVOID_OVERLAYFS" = 1 ] || ! mount -t overlay overlay -olowerdir="$mountpoint",upperdir="$spec",workdir="$overlay_workdir""$mountcontext" "$mountpoint" > /dev/null 2>&1; then |
55 | 58 | ||
56 | if [ "$specdir_existed" != "yes" ]; then | 59 | if [ "$specdir_existed" != "yes" ]; then |
57 | cp -aPR "$mountpoint"/. "$spec/" | 60 | cp -aPR "$mountpoint"/. "$spec/" |