From 4485cd903e59550a33d6086fcf2b329d2b405035 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 7 Aug 2013 15:17:15 +0800 Subject: 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. (From OE-Core rev: 742440441222e0627abbdd3eb2ee16401e8f4adf) Signed-off-by: Chen Qi Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh') 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 0ff0e1af7f..915b7d0b93 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 -- cgit v1.2.3-54-g00ecf