From: Chris PeBenito <Christopher.PeBenito@microsoft.com>
Date: Mon, 17 Jun 2019 19:05:22 +0000 (+0100)
Subject: volatile-binds: Change cp to use -a instead of -p.
X-Git-Tag: uninative-2.6~50
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ab7e3caf3e29f2d8db55e2901e0a9b01061afd88;p=openembedded-core.git

volatile-binds: Change cp to use -a instead of -p.

This is needed on SELinux systems, so the labels (xattrs) are preserved.

Signed-off-by: Chris PeBenito <Christopher.PeBenito@microsoft.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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
     if ! mount -t overlay overlay -olowerdir="$mountpoint",upperdir="$spec",workdir="$overlay_workdir" "$mountpoint" > /dev/null 2>&1; then
 
         if [ "$specdir_existed" != "yes" ]; then
-            cp -pPR "$mountpoint"/. "$spec/"
+            cp -aPR "$mountpoint"/. "$spec/"
         fi
 
         mount -o "bind$options" "$spec" "$mountpoint"
     fi
 elif [ -f "$mountpoint" ]; then
     if [ ! -f "$spec" ]; then
-        cp -pP "$mountpoint" "$spec"
+        cp -aP "$mountpoint" "$spec"
     fi
 
     mount -o "bind$options" "$spec" "$mountpoint"