summaryrefslogtreecommitdiff
path: root/release
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1995-10-27 03:59:38 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1995-10-27 03:59:38 +0000
commit8260a8caf01acd35c725466740a735af1553abf9 (patch)
tree2c6128cabb5731afb71f4b27c35462e663d65791 /release
parentbc32adf3b006fa2943d410d47b180efa00e59d12 (diff)
downloadsrc-test2-8260a8caf01acd35c725466740a735af1553abf9.tar.gz
src-test2-8260a8caf01acd35c725466740a735af1553abf9.zip
Notes
Diffstat (limited to 'release')
-rw-r--r--release/sysinstall/doc.c10
-rw-r--r--release/sysinstall/installFinal.c4
-rw-r--r--release/sysinstall/installUpgrade.c5
3 files changed, 5 insertions, 14 deletions
diff --git a/release/sysinstall/doc.c b/release/sysinstall/doc.c
index 68992731f5c2..ef5be2f2683d 100644
--- a/release/sysinstall/doc.c
+++ b/release/sysinstall/doc.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: doc.c,v 1.6 1995/10/26 08:55:40 jkh Exp $
+ * $Id: doc.c,v 1.7 1995/10/27 01:22:53 jkh Exp $
*
* Jordan Hubbard
*
@@ -27,14 +27,6 @@ docBrowser(char *junk)
{
char *browser = variable_get(VAR_BROWSER_PACKAGE);
- /* Make sure we were started at a reasonable time */
- if (!strcmp(variable_get(SYSTEM_STATE), "init")) {
- dialog_clear();
- msgConfirm("Sorry, it's not possible to invoke the browser until the system\n"
- "is installed completely enough to support a copy of %s.", browser);
- return RET_FAIL;
- }
-
if (!mediaVerify())
return RET_FAIL;
diff --git a/release/sysinstall/installFinal.c b/release/sysinstall/installFinal.c
index e4d7cb8f7857..1642b0826cb4 100644
--- a/release/sysinstall/installFinal.c
+++ b/release/sysinstall/installFinal.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: installFinal.c,v 1.10 1995/10/23 13:19:41 jkh Exp $
+ * $Id: installFinal.c,v 1.12 1995/10/26 08:55:47 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard & Coranth Gryphon. All rights reserved.
@@ -237,6 +237,8 @@ installNetworking(char *unused)
vsystem("echo >> /etc/exports");
systemExecute("ee /etc/exports");
}
+ configResolv();
+ configSysconfig();
return i;
}
diff --git a/release/sysinstall/installUpgrade.c b/release/sysinstall/installUpgrade.c
index a34cd5a0a7f6..4d1986d56f5f 100644
--- a/release/sysinstall/installUpgrade.c
+++ b/release/sysinstall/installUpgrade.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: installUpgrade.c,v 1.9 1995/10/24 02:18:06 jkh Exp $
+ * $Id: installUpgrade.c,v 1.11 1995/10/26 08:55:49 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -320,9 +320,6 @@ installUpgrade(char *str)
}
}
- if (extractingBin)
- configSysconfig();
-
if (installNetworking("upgrade") == RET_FAIL) {
dialog_clear();
msgConfirm("Some of the networking configuration stuff evidently failed, but\n"