summaryrefslogtreecommitdiffstats
path: root/etc/rc
diff options
context:
space:
mode:
authorjb <jb@FreeBSD.org>1998-12-10 08:06:59 +0000
committerjb <jb@FreeBSD.org>1998-12-10 08:06:59 +0000
commit8a08015602a776f35c09442f77f5708d9e0baff5 (patch)
treea51b80151f1f05b10af21e459d8d36f910b3d8ce /etc/rc
parentb5cf8d2577a9765e858bb8f3e4f26a73f68ee587 (diff)
downloadFreeBSD-src-8a08015602a776f35c09442f77f5708d9e0baff5.zip
FreeBSD-src-8a08015602a776f35c09442f77f5708d9e0baff5.tar.gz
Add a test for hw.machine == i386 before trying to run ldconfig for
legacy aout support.
Diffstat (limited to 'etc/rc')
-rw-r--r--etc/rc27
1 files changed, 15 insertions, 12 deletions
diff --git a/etc/rc b/etc/rc
index 1203546..d74d23a 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: rc,v 1.159 1998/10/08 18:47:29 des Exp $
+# $Id: rc,v 1.160 1998/10/09 17:11:14 des Exp $
# From: @(#)rc 5.27 (Berkeley) 6/5/91
# System startup script run by init on autoboot
@@ -252,17 +252,20 @@ if [ -x /sbin/ldconfig ]; then
ldconfig -elf ${_LDC}
fi
- # Default the a.out ldconfig path, in case the system's
- # /etc/rc.conf hasn't been updated.
- : ${ldconfig_paths_aout=${ldconfig_paths}}
- _LDC=/usr/lib/aout
- for i in $ldconfig_paths_aout; do
- if test -d $i; then
- _LDC="${_LDC} $i"
- fi
- done
- echo 'setting a.out ldconfig path:' ${_LDC}
- ldconfig -aout ${_LDC}
+ # Legacy aout support for i386 only
+ if [ X"`sysctl hw.machine`" = X"i386" ]; then
+ # Default the a.out ldconfig path, in case the system's
+ # /etc/rc.conf hasn't been updated.
+ : ${ldconfig_paths_aout=${ldconfig_paths}}
+ _LDC=/usr/lib/aout
+ for i in $ldconfig_paths_aout; do
+ if test -d $i; then
+ _LDC="${_LDC} $i"
+ fi
+ done
+ echo 'setting a.out ldconfig path:' ${_LDC}
+ ldconfig -aout ${_LDC}
+ fi
fi
# Now start up miscellaneous daemons that don't belong anywhere else
OpenPOWER on IntegriCloud