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.

2 files changed, 0 insertions, 6 deletions

diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c
index 56c328755cae..2e205e111861 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 a2073990c253..b5e5ee4cfb4c 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;