summaryrefslogtreecommitdiff
path: root/packages/initscripts
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-10-31 11:57:54 +0100
committerKoen Kooi <koen@openembedded.org>2008-10-31 11:57:54 +0100
commit6628886e858d77a8f9f94dd3229143e144d39f0e (patch)
tree74feafd576e422fdd303b186661e5c6f35f44831 /packages/initscripts
parentd00e1cb3d100ad9b528e72394a6d5440f06ed35c (diff)
initscripts: only run ldconfig on boot when ld.so.conf is present
Diffstat (limited to 'packages/initscripts')
-rwxr-xr-xpackages/initscripts/initscripts-1.0/bootmisc.sh6
-rw-r--r--packages/initscripts/initscripts_1.0.bb2
2 files changed, 5 insertions, 3 deletions
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 \