diff options
author | Chris PeBenito <Christopher.PeBenito@microsoft.com> | 2019-06-17 20:05:22 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-19 12:46:43 +0100 |
commit | af790692f5f1404b99561dbcf8f9df752d8c1f1e (patch) | |
tree | adede804903c4fe2e0dcc1a44f92f87b1bacd421 /meta | |
parent | 37e5436e1e7802347aaed18b9fd5cb4496f6cc1c (diff) | |
download | poky-af790692f5f1404b99561dbcf8f9df752d8c1f1e.tar.gz |
volatile-binds: Change cp to use -a instead of -p.
This is needed on SELinux systems, so the labels (xattrs) are preserved.
(From OE-Core rev: ab7e3caf3e29f2d8db55e2901e0a9b01061afd88)
Signed-off-by: Chris PeBenito <Christopher.PeBenito@microsoft.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rwxr-xr-x | meta/recipes-core/volatile-binds/files/mount-copybind | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/volatile-binds/files/mount-copybind b/meta/recipes-core/volatile-binds/files/mount-copybind index fddf520053..e32e675308 100755 --- a/meta/recipes-core/volatile-binds/files/mount-copybind +++ b/meta/recipes-core/volatile-binds/files/mount-copybind | |||
@@ -42,14 +42,14 @@ if [ -d "$mountpoint" ]; then | |||
42 | if ! mount -t overlay overlay -olowerdir="$mountpoint",upperdir="$spec",workdir="$overlay_workdir" "$mountpoint" > /dev/null 2>&1; then | 42 | if ! mount -t overlay overlay -olowerdir="$mountpoint",upperdir="$spec",workdir="$overlay_workdir" "$mountpoint" > /dev/null 2>&1; then |
43 | 43 | ||
44 | if [ "$specdir_existed" != "yes" ]; then | 44 | if [ "$specdir_existed" != "yes" ]; then |
45 | cp -pPR "$mountpoint"/. "$spec/" | 45 | cp -aPR "$mountpoint"/. "$spec/" |
46 | fi | 46 | fi |
47 | 47 | ||
48 | mount -o "bind$options" "$spec" "$mountpoint" | 48 | mount -o "bind$options" "$spec" "$mountpoint" |
49 | fi | 49 | fi |
50 | elif [ -f "$mountpoint" ]; then | 50 | elif [ -f "$mountpoint" ]; then |
51 | if [ ! -f "$spec" ]; then | 51 | if [ ! -f "$spec" ]; then |
52 | cp -pP "$mountpoint" "$spec" | 52 | cp -aP "$mountpoint" "$spec" |
53 | fi | 53 | fi |
54 | 54 | ||
55 | mount -o "bind$options" "$spec" "$mountpoint" | 55 | mount -o "bind$options" "$spec" "$mountpoint" |