diff options
| -rwxr-xr-x | meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh | 10 |
1 files changed, 6 insertions, 4 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 e707b20049..904037eeaa 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh | |||
| @@ -72,10 +72,12 @@ link_file() { | |||
| 72 | if [ -L \"$2\" ]; then | 72 | if [ -L \"$2\" ]; then |
| 73 | [ \"\$(readlink -f \"$2\")\" != \"\$(readlink -f \"$1\")\" ] && { rm -f \"$2\"; ln -sf \"$1\" \"$2\"; }; | 73 | [ \"\$(readlink -f \"$2\")\" != \"\$(readlink -f \"$1\")\" ] && { rm -f \"$2\"; ln -sf \"$1\" \"$2\"; }; |
| 74 | elif [ -d \"$2\" ]; then | 74 | elif [ -d \"$2\" ]; then |
| 75 | cp -a $2/* $1 2>/dev/null; | 75 | if awk '\$2 == \"$2\" {exit 1}' /proc/mounts; then |
| 76 | cp -a $2/.[!.]* $1 2>/dev/null; | 76 | cp -a $2/* $1 2>/dev/null; |
| 77 | rm -rf \"$2\"; | 77 | cp -a $2/.[!.]* $1 2>/dev/null; |
| 78 | ln -sf \"$1\" \"$2\"; | 78 | rm -rf \"$2\"; |
| 79 | ln -sf \"$1\" \"$2\"; | ||
| 80 | fi | ||
| 79 | else | 81 | else |
| 80 | ln -sf \"$1\" \"$2\"; | 82 | ln -sf \"$1\" \"$2\"; |
| 81 | fi | 83 | fi |