diff options
| author | billf <billf@FreeBSD.org> | 2000-03-31 01:03:41 +0000 |
|---|---|---|
| committer | billf <billf@FreeBSD.org> | 2000-03-31 01:03:41 +0000 |
| commit | 6bfa82197293277c159c079f65b8a9fcfd79f7d7 (patch) | |
| tree | cb436571afe81083c3cfec5c70e77644b8cec7ce | |
| parent | 4431d75b8dcd0a372af27021337ea790e222cdc2 (diff) | |
| download | FreeBSD-src-6bfa82197293277c159c079f65b8a9fcfd79f7d7.zip FreeBSD-src-6bfa82197293277c159c079f65b8a9fcfd79f7d7.tar.gz | |
Refresh the aout ldconfig info so things like compat22 when installed can
be detected by netscape and such.
PR: bin/17659
Submitted by: Murray Stokelay <murray@cdrom.com>
Approved by: jkh
jkh made updates that conflict with the submitters patch, so I updated
accordingly, any mistakes are mine, not the submitters.
| -rw-r--r-- | release/sysinstall/config.c | 5 | ||||
| -rw-r--r-- | usr.sbin/sade/config.c | 5 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/config.c | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c index 47ee9a8..503679f 100644 --- a/release/sysinstall/config.c +++ b/release/sysinstall/config.c @@ -626,6 +626,11 @@ 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"); execfile = string_concat("/usr/X11R6/bin/", config); if (file_executable(execfile)) { diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c index 47ee9a8..503679f 100644 --- a/usr.sbin/sade/config.c +++ b/usr.sbin/sade/config.c @@ -626,6 +626,11 @@ 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"); execfile = string_concat("/usr/X11R6/bin/", config); if (file_executable(execfile)) { diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c index 47ee9a8..503679f 100644 --- a/usr.sbin/sysinstall/config.c +++ b/usr.sbin/sysinstall/config.c @@ -626,6 +626,11 @@ 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"); execfile = string_concat("/usr/X11R6/bin/", config); if (file_executable(execfile)) { |
