1. Eliminate the sendmail.cw bogon again. Peter fixed it correctly.

2. Preload the ldconfig cache before calling X setup.

4 files changed, 6 insertions, 12 deletions

diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c
index ef616430c4c0..0ad3bec39204 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.55 1996/11/07 15:35:42 jkh Exp $
+ * $Id: config.c,v 1.56 1996/11/07 16:34:12 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -359,6 +359,7 @@ configXFree86(dialogMenuItem *self)
 {
     if (file_executable("/usr/X11R6/bin/XF86Setup")) {
 	dialog_clear();
+	systemExecute("/sbin/ldconfig /usr/lib /usr/X11R6/lib /usr/local/lib /compat/lib");
 	systemExecute("/usr/X11R6/bin/XF86Setup");
 	return DITEM_SUCCESS | DITEM_RESTORE;
     }
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 6e82d7076ebc..52badb1fcc9a 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.135 1996/11/04 12:56:22 jkh Exp $
+ * $Id: install.c,v 1.136 1996/11/07 15:45:59 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -650,10 +650,6 @@ installFixup(dialogMenuItem *self)
 	Mkdir("/var/db");
 	creat("/var/db/mountdtab", 0644);
 
-	/* BOGON #4: We need a default /etc/sendmail.cw right now */
-	if (!file_readable("/etc/sendmail.cw"))
-	    vsystem("touch /etc/sendmail.cw");
-
 	/* Now run all the mtree stuff to fix things up */
         vsystem("mtree -deU -f /etc/mtree/BSD.root.dist -p /");
         vsystem("mtree -deU -f /etc/mtree/BSD.var.dist -p /var");
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c
index ef616430c4c0..0ad3bec39204 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.55 1996/11/07 15:35:42 jkh Exp $
+ * $Id: config.c,v 1.56 1996/11/07 16:34:12 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -359,6 +359,7 @@ configXFree86(dialogMenuItem *self)
 {
     if (file_executable("/usr/X11R6/bin/XF86Setup")) {
 	dialog_clear();
+	systemExecute("/sbin/ldconfig /usr/lib /usr/X11R6/lib /usr/local/lib /compat/lib");
 	systemExecute("/usr/X11R6/bin/XF86Setup");
 	return DITEM_SUCCESS | DITEM_RESTORE;
     }
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 6e82d7076ebc..52badb1fcc9a 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.135 1996/11/04 12:56:22 jkh Exp $
+ * $Id: install.c,v 1.136 1996/11/07 15:45:59 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -650,10 +650,6 @@ installFixup(dialogMenuItem *self)
 	Mkdir("/var/db");
 	creat("/var/db/mountdtab", 0644);
 
-	/* BOGON #4: We need a default /etc/sendmail.cw right now */
-	if (!file_readable("/etc/sendmail.cw"))
-	    vsystem("touch /etc/sendmail.cw");
-
 	/* Now run all the mtree stuff to fix things up */
         vsystem("mtree -deU -f /etc/mtree/BSD.root.dist -p /");
         vsystem("mtree -deU -f /etc/mtree/BSD.var.dist -p /var");