initscripts: Check link exists in volatiles script

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/packages/initscripts/initscripts-1.0/populate-volatile.sh b/meta/packages/initscripts/initscripts-1.0/populate-volatile.sh
index 4c369e0b3e22d7680653627a172e7a2a4b91969a..8742dbfc6b67e7cd38276f7d8869d9fbec8218fc 100755 (executable)
--- a/meta/packages/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/meta/packages/initscripts/initscripts-1.0/populate-volatile.sh
@@ -178,7 +178,7 @@ else
        done
 fi
 
-if test -f /etc/ld.so.cache
+if test -f /etc/ld.so.cache -a ! -f /var/run/ld.so.cache
 then
        ln -s /etc/ld.so.cache /var/run/ld.so.cache
 fi

diff --git a/meta/packages/initscripts/initscripts_1.0.bb b/meta/packages/initscripts/initscripts_1.0.bb
index 1a36e3bc7f2371cd8951bfab1c384194be694761..08a0f7806f2490c9a6e92a0fc53e7e9dbc186836 100644 (file)
--- a/meta/packages/initscripts/initscripts_1.0.bb
+++ b/meta/packages/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r119"
+PR = "r120"
 
 SRC_URI = "file://functions \
            file://halt \