diff options
author | Jordan K. Hubbard <jkh@FreeBSD.org> | 1993-12-30 18:19:18 +0000 |
---|---|---|
committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 1993-12-30 18:19:18 +0000 |
commit | 752d10d34eea06ec3f476111fd706953248e1a5f (patch) | |
tree | 71fce643b8bdd719c1cbf7fa21590497d1fdd41d /etc | |
parent | af340e7bf5b8b0e9f53878dfded4d180976b2136 (diff) | |
download | src-752d10d34eea06ec3f476111fd706953248e1a5f.tar.gz src-752d10d34eea06ec3f476111fd706953248e1a5f.zip |
Added more robust ldconfig setting in rc, removed redundant ldconfig in
rc.local.
Notes
Notes:
svn path=/head/; revision=920
Diffstat (limited to 'etc')
-rw-r--r-- | etc/rc | 11 | ||||
-rw-r--r-- | etc/rc.local | 4 |
2 files changed, 9 insertions, 6 deletions
@@ -1,5 +1,5 @@ #!/bin/sh -# $Id: rc,v 1.10 1993/12/21 02:58:15 ache Exp $ +# $Id: rc,v 1.11 1993/12/21 21:28:12 wollman Exp $ # From: @(#)rc 5.27 (Berkeley) 6/5/91 # System startup script run by init on autoboot @@ -81,8 +81,15 @@ rm -f /var/spool/uucp/LCK.* rm -f /var/spool/uucp/STST/* (cd /var/run && { rm -rf -- *; cp /dev/null utmp; chmod 644 utmp; }) +# Make shared lib searching a little faster. Leave /usr/lib first if you +# add your own entries or you may come to grief. if [ -x /sbin/ldconfig ]; then - ldconfig /usr/X386/lib + _LDC=/usr/lib + if [ -d /usr/X386/lib ]; then _LDC="${_LDC} /usr/X386/lib" ; fi + if [ -d /usr/local/lib ]; then _LDC="${_LDC} /usr/local/lib" ; fi + if [ -d /usr/gnu/lib ]; then _LDC="${_LDC} /usr/gnu/lib" ; fi + echo 'setting ldconfig path:' ${_LDC} + ldconfig ${_LDC} fi echo -n 'starting system logger' diff --git a/etc/rc.local b/etc/rc.local index 0a93836fd794..dbbd909a5b91 100644 --- a/etc/rc.local +++ b/etc/rc.local @@ -13,10 +13,6 @@ cp $T /etc/motd chmod 666 /etc/motd rm -f $T -# This is a performance win with shared libraries. -echo 'setting default ldconfig path.' -ldconfig /usr/lib /usr/X386/lib /usr/local/lib /usr/gnu/lib - echo -n 'starting local daemons:' # Kerberos runs ONLY on the Kerberos server machine |