Bah, I got the MFC and this commit backwards. :)

3 files changed, 2 insertions, 4 deletions

diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c
index c4c241a..4dda1ac 100644
--- a/usr.sbin/sysinstall/config.c
+++ b/usr.sbin/sysinstall/config.c
@@ -590,7 +590,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");
-    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)) {
diff --git a/usr.sbin/sysinstall/options.c b/usr.sbin/sysinstall/options.c
index 8f3c97f..e9187f7 100644
--- a/usr.sbin/sysinstall/options.c
+++ b/usr.sbin/sysinstall/options.c
@@ -217,7 +217,7 @@ optionsEditor(dialogMenuItem *self)
     static int currOpt = 0;
     WINDOW *w = savescr();
     
-    dialog_clear_norefresh();
+    dialog_clear();
     clear();
 
     while (1) {
diff --git a/usr.sbin/sysinstall/package.c b/usr.sbin/sysinstall/package.c
index e63c601..2b7a27e 100644
--- a/usr.sbin/sysinstall/package.c
+++ b/usr.sbin/sysinstall/package.c
@@ -130,8 +130,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");
+	vsystem("ldconfig /usr/lib /usr/lib/compat /usr/local/lib /usr/X11R6/lib");
 
     /* Be initially optimistic */
     ret = DITEM_SUCCESS;