summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorRobert Peichaer <rpe@cvs.openbsd.org>2015-12-02 20:39:58 +0000
committerRobert Peichaer <rpe@cvs.openbsd.org>2015-12-02 20:39:58 +0000
commit966de73d17d3074bd2a0f9c4baac345a5df53102 (patch)
tree481af0bb403c368ce8344eac2d4e756340f3a109 /etc
parent049da74b0ac300af44fce13a2c6191cbb2821d36 (diff)
Since version 1.467 of /etc/rc, it was no longer possible to add
shlib_dirs using /etc/rc.conf.local. Fix from Jan Johansson, thanks. OK krw@, halex@
Diffstat (limited to 'etc')
-rw-r--r--etc/rc4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/rc b/etc/rc
index 535a41f1471..f702241538b 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.470 2015/11/27 03:53:28 deraadt Exp $
+# $OpenBSD: rc,v 1.471 2015/12/02 20:39:57 rpe Exp $
# System startup script run by init on autoboot or after single-user.
# Output and error are redirected to console by init, and the console is the
@@ -442,7 +442,7 @@ fi
if [[ -x /sbin/ldconfig ]]; then
echo 'creating runtime link editor directory cache.'
- [[ -d /usr/local/lib ]] && shlib_dirs="/usr/local/lib"
+ [[ -d /usr/local/lib ]] && shlib_dirs="/usr/local/lib $shlib_dirs"
[[ -d /usr/X11R6/lib ]] && shlib_dirs="/usr/X11R6/lib $shlib_dirs"
ldconfig $shlib_dirs
fi