From f2631f1edc424929de98d61e47119d74407cedd1 Mon Sep 17 00:00:00 2001 From: millert <> Date: Mon, 24 May 1999 18:00:05 +0000 Subject: [PATCH] Add shlib_dirs variable so users can add to the directories cached in /var/run/ld.so.hints --- src/etc/rc | 9 ++++----- src/etc/rc.conf | 3 ++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/etc/rc b/src/etc/rc index 35ef6454..284028b9 100644 --- a/src/etc/rc +++ b/src/etc/rc @@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.96 1999/04/21 20:18:02 alex Exp $ +# $OpenBSD: rc,v 1.97 1999/05/24 18:00:05 millert Exp $ # System startup script run by init on autoboot # or after single-user. @@ -441,14 +441,13 @@ fi if [ -f /sbin/ldconfig ]; then echo 'creating runtime link editor directory cache.' - _LIBS= if [ -d /usr/local/lib ]; then - _LIBS="$_LIBS /usr/local/lib" + shlib_dirs=="$shlib_dirs /usr/local/lib" fi if [ -d /usr/X11R6/lib ]; then - _LIBS="$_LIBS /usr/X11R6/lib" + shlib_dirs=="$shlib_dirs /usr/X11R6/lib" fi - ldconfig $_LIBS + ldconfig $shlib_dirs fi # Kerberos runs ONLY on the Kerberos servers diff --git a/src/etc/rc.conf b/src/etc/rc.conf index df4cbe24..f57e2821 100644 --- a/src/etc/rc.conf +++ b/src/etc/rc.conf @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: rc.conf,v 1.35 1999/03/29 22:09:58 niklas Exp $ +# $OpenBSD: rc.conf,v 1.36 1999/05/24 18:00:05 millert Exp $ # set these to "NO" to turn them off. otherwise, they're used as flags routed_flags=NO # for 'normal' use: routed_flags="-q" @@ -68,3 +68,4 @@ named_chroot=/var/named # Where to chroot named if not empty afs_mount_point=/afs # Mountpoint for AFS afs_device=/dev/xfs0 # Device used by afsd afsd_flags=-z # Flags passed to afsd +shlib_dirs= # extra directories for ldconfig