[oe-commits] Chen Qi : populate-volatile.sh: use 'cp -a' to avoid potential problem

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 742440441222e0627abbdd3eb2ee16401e8f4adf
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=742440441222e0627abbdd3eb2ee16401e8f4adf

Author: Chen Qi <Qi.Chen at windriver.com>
Date:   Wed Aug  7 15:17:15 2013 +0800

populate-volatile.sh: use 'cp -a' to avoid potential problem

Previously, dead links in target directory will not be copied.
This is incorrect as dead links are not uncommon in our rootfs.
So we use '-a' option instead.

Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 .../initscripts-1.0/populate-volatile.sh           |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
index 0ff0e1a..915b7d0 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
@@ -72,7 +72,8 @@ link_file() {
 	if [ -L \"$2\" ]; then
 		[ \"\$(readlink -f \"$2\")\" != \"\$(readlink -f \"$1\")\" ] && { rm -f \"$2\"; ln -sf \"$1\" \"$2\"; };
 	elif [ -d \"$2\" ]; then
-		for f in $2/* $2/.[^.]*; do [ -e \$f ] && cp -rf \$f $1; done;
+		cp -a $2/* $1 2>/dev/null;
+		cp -a $2/.[!.]* $1 2>/dev/null;
 		rm -rf \"$2\";
 		ln -sf \"$1\" \"$2\";
 	else