mount-copybind: fix shellcheck warning
PATCH 1/2 mount-copybind: fix shellcheck warning
From: Luca Boccassi <[email protected]>
$ shellcheck meta/recipes-core/volatile-binds/files/mount-copybind
In meta/recipes-core/volatile-binds/files/mount-copybind line 54:
mountcontext=",rootcontext=$(matchpathcon -n $mountpoint)"
^---------^ SC2086: Double quote to prevent globbing and word splitting.
Did you mean:
mountcontext=",rootcontext=$(matchpathcon -n "$mountpoint")"
For more information:
https://www.shellcheck.net/wiki/SC2086 -- Double quote to prevent globbing ...
--- meta/recipes-core/volatile-binds/files/mount-copybind | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/volatile-binds/files/mount-copybind +1 -1
@@ -48,7 +48,7 @@ if [ -d "$mountpoint" ]; then # If that fails, fall back to slower copy. if command -v selinuxenabled > /dev/null 2>&1; then if selinuxenabled; then - mountcontext=",rootcontext=$(matchpathcon -n $mountpoint)" + mountcontext=",rootcontext=$(matchpathcon -n "$mountpoint")" fi fi if ! mount -t overlay overlay -olowerdir="$mountpoint",upperdir="$spec",workdir="$overlay_workdir""$mountcontext" "$mountpoint" > /dev/null 2>&1; then
Signature · 1 line
2.34.1
PATCH 2/2 mount-copybind: add MOUNT_COPYBIND_AVOID_OVERLAYFS env var to skip OverlayFS
From: Luca Boccassi <[email protected]>
In some cases we don't want to even attempt to set up OverlayFS, for example because SELinux in enforcing mode would kill the process attempting to use the mount. See:
If MOUNT_COPYBIND_AVOID_OVERLAYFS=1 is set, skip directly to copy and bind mount.
--- meta/recipes-core/volatile-binds/files/mount-copybind | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-core/volatile-binds/files/mount-copybind +4 -1
@@ -2,6 +2,9 @@ # # Perform a bind mount, copying existing files as we do so to ensure the # overlaid path has the necessary content. +# If the target is a directory and overlayfs is available (and the environment +# variable MOUNT_COPYBIND_AVOID_OVERLAYFS=1 is not set), then an overlay mount +# will be attempted first. if [ $# -lt 2 ]; then echo >&2 "Usage: $0 spec mountpoint [OPTIONS]"
@@ -51,7 +54,7 @@ if [ -d "$mountpoint" ]; then mountcontext=",rootcontext=$(matchpathcon -n "$mountpoint")" fi fi - if ! mount -t overlay overlay -olowerdir="$mountpoint",upperdir="$spec",workdir="$overlay_workdir""$mountcontext" "$mountpoint" > /dev/null 2>&1; then + if [ "$MOUNT_COPYBIND_AVOID_OVERLAYFS" = 1 ] || ! mount -t overlay overlay -olowerdir="$mountpoint",upperdir="$spec",workdir="$overlay_workdir""$mountcontext" "$mountpoint" > /dev/null 2>&1; then if [ "$specdir_existed" != "yes" ]; then cp -aPR "$mountpoint"/. "$spec/"
Signature · 1 line
2.34.1
Re: [OE-core] [PATCH 2/2] mount-copybind: add MOUNT_COPYBIND_AVOID_OVERLAYFS env var to skip OverlayFS
Hi Luca,
Quoted 6 lines · Luca Bocassi
From: Luca Boccassi <[email protected]>
In some cases we don't want to even attempt to set up OverlayFS, for example because SELinux in enforcing mode would kill the process attempting to use the mount. See:
Quoted 6 lines
If MOUNT_COPYBIND_AVOID_OVERLAYFS=1 is set, skip directly to copy and bind mount.
Signed-off-by Luca Boccassi <[email protected]>
Thanks for the patch!
Now that the patch is merged, would you mind proposing a patch to add a description of it to the documentation? You'll probably do it better than I would.
Thanks in advance
Michael.
Signature · 3 lines
Michael Opdenacker, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Re: [OE-core] [PATCH 2/2] mount-copybind: add MOUNT_COPYBIND_AVOID_OVERLAYFS env var to skip OverlayFS
Quoted 17 lines · Michael Opdenacker
Hi Luca,
Quoted 6 lines · Luca Bocassi
From: Luca Boccassi <[email protected]>
In some cases we don't want to even attempt to set up OverlayFS, for example because SELinux in enforcing mode would kill the process attempting to use the mount. See:
Quoted 6 lines
If MOUNT_COPYBIND_AVOID_OVERLAYFS=1 is set, skip directly to copy and bind mount.
Signed-off-by Luca Boccassi <[email protected]>
Quoted 7 lines
Thanks for the patch!
Now that the patch is merged, would you mind proposing a patch to add a description of it to the documentation? You'll probably do it better than I would.Thanks in advance
Michael.
Sure I can do that, where should it be listed exactly?
Signature · 2 lines
Kind regards, Luca Boccassi
Re: [OE-core] [PATCH 2/2] mount-copybind: add MOUNT_COPYBIND_AVOID_OVERLAYFS env var to skip OverlayFS
Hi Luca,
Quoted 9 lines · Luca Bocassi
Quoted 8 lines
Thanks for the patch!
Now that the patch is merged, would you mind proposing a patch to add a description of it to the documentation? You'll probably do it better than I would.Thanks in advance
Michael.Sure I can do that, where should it be listed exactly?
Great!
Well, I was thinking about adding an entry to
https://git.yoctoproject.org/yocto-docs/tree/documentation/ref-manual/variables.rst
corresponding to https://docs.yoctoproject.org/ref-manual/variables.html
However, I'm starting to have doubts as "volatile-binds" are not even documented. Is this new variable meant to be used in the configuration file? If so, it probably needs documenting, but it's nice when a variable is either attached to a bbclass or is introduced in one of the manuals too.
Ideas anyone?
Thanks again
Michael.
Signature · 3 lines
Michael Opdenacker, Bootlin Embedded Linux and Kernel engineering https://bootlin.com