diff options
author | obrien <obrien@FreeBSD.org> | 2004-01-02 09:33:58 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2004-01-02 09:33:58 +0000 |
commit | b995010e0de6af49eff2ce036704f426ea21e1f9 (patch) | |
tree | 8d6a368fe4730d054641b32358cc278ec68ca08c /usr.sbin | |
parent | 74a2ee415006c7cb0942f3312ea1bc5cf43efe69 (diff) | |
download | FreeBSD-src-b995010e0de6af49eff2ce036704f426ea21e1f9.zip FreeBSD-src-b995010e0de6af49eff2ce036704f426ea21e1f9.tar.gz |
I think we can stop doing 'ldconfig -aout' during the install now.
The base install doesn't have any a.out bits anymore and hasn't for years.
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/sade/config.c | 4 | ||||
-rw-r--r-- | usr.sbin/sysinstall/config.c | 4 | ||||
-rw-r--r-- | usr.sbin/sysinstall/package.c | 2 |
3 files changed, 0 insertions, 10 deletions
diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c index 56c3287..2e205e1 100644 --- a/usr.sbin/sade/config.c +++ b/usr.sbin/sade/config.c @@ -712,10 +712,6 @@ tryagain: vsystem("/sbin/ldconfig -m /usr/lib /usr/X11R6/lib /usr/local/lib /usr/lib/compat"); else vsystem("/sbin/ldconfig /usr/lib /usr/X11R6/lib /usr/local/lib /usr/lib/compat"); - if (file_readable("/var/run/ld.so.hints")) - vsystem("ldconfig -m -aout /usr/lib/aout /usr/lib/compat/aout /usr/local/lib/aout /usr/X11R6/lib/aout"); - else - vsystem("ldconfig -aout /usr/lib/aout /usr/lib/compat/aout /usr/local/lib/aout /usr/X11R6/lib/aout"); vsystem("/sbin/ifconfig lo0 127.0.0.1"); diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c index 56c3287..2e205e1 100644 --- a/usr.sbin/sysinstall/config.c +++ b/usr.sbin/sysinstall/config.c @@ -712,10 +712,6 @@ tryagain: vsystem("/sbin/ldconfig -m /usr/lib /usr/X11R6/lib /usr/local/lib /usr/lib/compat"); else vsystem("/sbin/ldconfig /usr/lib /usr/X11R6/lib /usr/local/lib /usr/lib/compat"); - if (file_readable("/var/run/ld.so.hints")) - vsystem("ldconfig -m -aout /usr/lib/aout /usr/lib/compat/aout /usr/local/lib/aout /usr/X11R6/lib/aout"); - else - vsystem("ldconfig -aout /usr/lib/aout /usr/lib/compat/aout /usr/local/lib/aout /usr/X11R6/lib/aout"); vsystem("/sbin/ifconfig lo0 127.0.0.1"); diff --git a/usr.sbin/sysinstall/package.c b/usr.sbin/sysinstall/package.c index a207399..b5e5ee4 100644 --- a/usr.sbin/sysinstall/package.c +++ b/usr.sbin/sysinstall/package.c @@ -132,8 +132,6 @@ package_extract(Device *dev, char *name, Boolean depended) /* If necessary, initialize the ldconfig hints */ if (!file_readable("/var/run/ld-elf.so.hints")) vsystem("ldconfig /usr/lib /usr/lib/compat /usr/local/lib /usr/X11R6/lib"); - if (!file_readable("/var/run/ld.so.hints")) - vsystem("ldconfig -aout /usr/lib/aout /usr/lib/compat/aout /usr/local/lib/aout /usr/X11R6/lib/aout"); /* Be initially optimistic */ ret = DITEM_SUCCESS; |