diff options
| author | jkh <jkh@FreeBSD.org> | 1999-05-18 00:44:28 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1999-05-18 00:44:28 +0000 |
| commit | db30e58662463d745c6d7c6f5337d1473c30b0bd (patch) | |
| tree | 307bb6218b18a5a88699fb5a88c5b05ee775c570 /release/sysinstall | |
| parent | 2fde75e5f6e59b5fed505bd64a493848eb433244 (diff) | |
| download | FreeBSD-src-db30e58662463d745c6d7c6f5337d1473c30b0bd.zip FreeBSD-src-db30e58662463d745c6d7c6f5337d1473c30b0bd.tar.gz | |
deal with a.out ldconfig paths also.
Diffstat (limited to 'release/sysinstall')
| -rw-r--r-- | release/sysinstall/config.c | 8 | ||||
| -rw-r--r-- | release/sysinstall/package.c | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c index ca96371..6a23e4d7 100644 --- a/release/sysinstall/config.c +++ b/release/sysinstall/config.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: config.c,v 1.134 1999/05/15 14:34:20 jkh Exp $ + * $Id: config.c,v 1.135 1999/05/15 15:05:08 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -552,9 +552,11 @@ tryagain: } if (file_readable("/var/run/ld.so.hints")) - systemExecute("/sbin/ldconfig -m /usr/lib /usr/X11R6/lib /usr/local/lib /usr/lib/compat"); + vsystem("/sbin/ldconfig -m /usr/lib /usr/X11R6/lib /usr/local/lib /usr/lib/compat"); else - systemExecute("/sbin/ldconfig /usr/lib /usr/X11R6/lib /usr/local/lib /usr/lib/compat"); + vsystem("/sbin/ldconfig /usr/lib /usr/X11R6/lib /usr/local/lib /usr/lib/compat"); + vsystem("/sbin/ldconfig -aout /usr/lib/compat/aout /usr/lib/aout /usr/X11R6/lib/aout /usr/local/lib/aout"); + vsystem("/sbin/ifconfig lo0 127.0.0.1"); execfile = string_concat("/usr/X11R6/bin/", config); if (file_executable(execfile)) { dialog_clear_norefresh(); diff --git a/release/sysinstall/package.c b/release/sysinstall/package.c index 3f73433..70d9602 100644 --- a/release/sysinstall/package.c +++ b/release/sysinstall/package.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: package.c,v 1.74 1999/05/14 14:57:59 jkh Exp $ + * $Id: package.c,v 1.75 1999/05/15 14:34:22 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -131,6 +131,7 @@ package_extract(Device *dev, char *name, Boolean depended) /* If necessary, initialize the ldconfig hints */ if (!file_readable("/var/run/ld.so.hints")) vsystem("ldconfig /usr/lib /usr/local/lib /usr/X11R6/lib"); + vsystem("/sbin/ldconfig -aout /usr/lib/compat/aout /usr/lib/aout /usr/X11R6/lib/aout /usr/local/lib/aout"); /* Be initially optimistic */ ret = DITEM_SUCCESS | DITEM_RESTORE; |
