From 4ee02f4bb84382ffd9291e09015fc8805a353e59 Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Tue, 18 May 1999 00:44:28 +0000 Subject: [PATCH] deal with a.out ldconfig paths also. --- release/sysinstall/config.c | 8 +++++--- release/sysinstall/package.c | 3 ++- usr.sbin/sade/config.c | 8 +++++--- usr.sbin/sysinstall/config.c | 8 +++++--- usr.sbin/sysinstall/package.c | 3 ++- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c index ca963716fd45..6a23e4d73b2c 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 3f7343325439..70d9602406a6 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; diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c index ca963716fd45..6a23e4d73b2c 100644 --- a/usr.sbin/sade/config.c +++ b/usr.sbin/sade/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/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c index ca963716fd45..6a23e4d73b2c 100644 --- a/usr.sbin/sysinstall/config.c +++ b/usr.sbin/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/usr.sbin/sysinstall/package.c b/usr.sbin/sysinstall/package.c index 3f7343325439..70d9602406a6 100644 --- a/usr.sbin/sysinstall/package.c +++ b/usr.sbin/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;