summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1996-10-09 07:13:31 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1996-10-09 07:13:31 +0000
commit1e757b1219857c7f79c2eb3d0379fe9c11f80779 (patch)
tree9848ca3219a6ed1c480c70b6819706a8cd8e4458
parent35237c0314061617a40a3a74e0514cfa796a3cf8 (diff)
bit more careful ldconfig
-rw-r--r--etc/rc11
1 files changed, 9 insertions, 2 deletions
diff --git a/etc/rc b/etc/rc
index 6f4b62731f0..909a2173ad8 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.25 1996/09/23 13:06:36 deraadt Exp $
+# $OpenBSD: rc,v 1.26 1996/10/09 07:13:30 deraadt Exp $
# System startup script run by init on autoboot
# or after single-user.
@@ -297,7 +297,14 @@ rm -f $T
if [ -f /sbin/ldconfig ]; then
echo 'creating runtime link editor directory cache.'
- ldconfig /usr/local/lib /usr/X11R6/lib
+ _LIBS=
+ if [ -d /usr/local/lib ]; then
+ _LIBS="$_LIBS /usr/local/lib"
+ fi
+ if [ -d /usr/X11R6/lib ]; then
+ _LIBS="$_LIBS /usr/X11R6/lib"
+ fi
+ ldconfig $_LIBS
fi
# Kerberos runs ONLY on the Kerberos server machine