initscripts: only run ldconfig on boot when ld.so.conf is present

diff --git a/packages/initscripts/initscripts-1.0/bootmisc.sh b/packages/initscripts/initscripts-1.0/bootmisc.sh
index 2a40e0c..dde1209 100755 (executable)
--- a/packages/initscripts/initscripts-1.0/bootmisc.sh
+++ b/packages/initscripts/initscripts-1.0/bootmisc.sh
@@ -57,9 +57,11 @@ then
 fi
 
 #
-# Update dynamic library cache
+# Update dynamic library cache, but only if ld.so.conf is present
 #
-/sbin/ldconfig
+if [ -e /etc/ld.so.conf ] ; then
+       /sbin/ldconfig
+fi
 
 # Set the system clock from hardware clock
 # If the timestamp is 1 day or more recent than the current time,

diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index b1c4317..8daefc5 100644 (file)
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r109"
+PR = "r110"
 
 SRC_URI = "file://functions \
            file://halt \