From c3b3b643ef89164a081e4096b1b2cb621e4a1fd3 Mon Sep 17 00:00:00 2001 From: rpe <> Date: Wed, 2 Dec 2015 20:39:57 +0000 Subject: [PATCH] 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@ --- src/etc/rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/etc/rc b/src/etc/rc index 535a41f1..f7022415 100644 --- a/src/etc/rc +++ b/src/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