summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormillert <millert@openbsd.org>1999-05-24 18:00:05 +0000
committermillert <millert@openbsd.org>1999-05-24 18:00:05 +0000
commit864e0004d4890799d2350c96188b786bfdf14424 (patch)
treec043f69f65730da980e2751faa4057820b0d0d07
parentDynamically allocate memory for structures whose sizes are based on the (diff)
downloadwireguard-openbsd-864e0004d4890799d2350c96188b786bfdf14424.tar.xz
wireguard-openbsd-864e0004d4890799d2350c96188b786bfdf14424.zip
Add shlib_dirs variable so users can add to the directories cached
in /var/run/ld.so.hints
-rw-r--r--etc/rc9
-rw-r--r--etc/rc.conf3
2 files changed, 6 insertions, 6 deletions
diff --git a/etc/rc b/etc/rc
index 35ef6454283..284028b92a0 100644
--- a/etc/rc
+++ b/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/etc/rc.conf b/etc/rc.conf
index df4cbe244c0..f57e28219d2 100644
--- a/etc/rc.conf
+++ b/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