diff options
author | John Birrell <jb@FreeBSD.org> | 1998-12-10 08:06:59 +0000 |
---|---|---|
committer | John Birrell <jb@FreeBSD.org> | 1998-12-10 08:06:59 +0000 |
commit | ad06d8fc41a922fbc85f92834fc3042977287d2a (patch) | |
tree | e5443131e0b4766ee7a85b0377faa4e4b5af6d0f | |
parent | e151cd19019334ae9caa61483e0bf520d0ad0f0f (diff) | |
download | src-ad06d8fc41a922fbc85f92834fc3042977287d2a.tar.gz src-ad06d8fc41a922fbc85f92834fc3042977287d2a.zip |
Add a test for hw.machine == i386 before trying to run ldconfig for
legacy aout support.
Notes
Notes:
svn path=/head/; revision=41648
-rw-r--r-- | etc/rc | 27 |
1 files changed, 15 insertions, 12 deletions
@@ -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 |