diff options
author | jkh <jkh@FreeBSD.org> | 1996-11-08 05:38:27 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1996-11-08 05:38:27 +0000 |
commit | f8952e421cb2f16207b93b3ec8b6919256eb8a94 (patch) | |
tree | 6e3e6e140d77494d6e8205fb00db6bd5b660e96f /release | |
parent | e0450ac1fb859607864df00cbc6a832ddd88c7d9 (diff) | |
download | FreeBSD-src-f8952e421cb2f16207b93b3ec8b6919256eb8a94.zip FreeBSD-src-f8952e421cb2f16207b93b3ec8b6919256eb8a94.tar.gz |
1. Eliminate the sendmail.cw bogon again. Peter fixed it correctly.
2. Preload the ldconfig cache before calling X setup.
Diffstat (limited to 'release')
-rw-r--r-- | release/sysinstall/config.c | 3 | ||||
-rw-r--r-- | release/sysinstall/install.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c index ef61643..0ad3bec 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.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/release/sysinstall/install.c b/release/sysinstall/install.c index 6e82d70..52badb1 100644 --- a/release/sysinstall/install.c +++ b/release/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"); |