From: Koen Kooi <koen@openembedded.org>
Date: Fri, 31 Oct 2008 10:57:54 +0000 (+0100)
Subject: initscripts: only run ldconfig on boot when ld.so.conf is present
X-Git-Tag: Release-2010-05/1~5531
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6628886e858d77a8f9f94dd3229143e144d39f0e;p=openembedded.git

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 2a40e0c410..dde1209be5 100755
--- 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 b1c43174e8..8daefc519d 100644
--- 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 \