Fix the bug I introduced with /etc/sysconfig not being updated

properly.
Make some cosmetic doc changes here and there in response to user
feedback.

2 files changed, 22 insertions, 9 deletions

diff --git a/release/sysinstall/doc.c b/release/sysinstall/doc.c
index 0345007..6899273 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.5 1995/10/22 17:39:05 jkh Exp $
+ * $Id: doc.c,v 1.6 1995/10/26 08:55:40 jkh Exp $
  *
  * Jordan Hubbard
  *
@@ -81,13 +81,26 @@ docShowDocument(char *str)
 	where = "http://www.freebsd.org";
     else if (!strcmp(str, "Other"))
 	where = msgGetInput("http://www.freebsd.org", "Please enter the URL of the location you wish to visit.");
-    else {
-	sprintf(target, "/usr/share/doc/%s/%s.html", str, str);
+    else if (!strcmp(str, "FAQ")) {
+	strcpy(target, "/usr/share/doc/FAQ/freebsd-faq.html");
 	if (!file_readable(target))
-	    sprintf(target, "http://www.freebsd.org/%s", str);
+	    strcpy(target, "http://www.freebsd.org/FAQ");
 	where = target;
     }
-    sprintf(tmp, "%s %s", browser, where);
-    systemExecute(tmp);
-    return RET_SUCCESS;
+    else if (!strcmp(str, "Handbook")) {
+	strcpy(target, "/usr/share/doc/handbook/handbook.html");
+	if (!file_readable(target))
+	    strcpy(target, "http://www.freebsd.org/handbook");
+	where = target;
+    }
+    if (where) {
+	sprintf(tmp, "%s %s", browser, where);
+	systemExecute(tmp);
+	return RET_SUCCESS;
+    }
+    else {
+	msgConfirm("Hmmmmm!  I can't seem to access the documentation you selected!\n"
+		   "Have you loaded the bin distribution?  Is your network connected?");
+	return RET_FAIL;
+    }
 }
diff --git a/release/sysinstall/installPreconfig.c b/release/sysinstall/installPreconfig.c
index 010aec9..a72f463 100644
--- a/release/sysinstall/installPreconfig.c
+++ b/release/sysinstall/installPreconfig.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: installPreconfig.c,v 1.13 1995/10/23 13:19:43 jkh Exp $
+ * $Id: installPreconfig.c,v 1.14 1995/10/24 02:18:00 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -101,7 +101,7 @@ static struct _word {
     { "msgConfirm",		msgSimpleConfirm	},
     { "msgNotify",		msgSimpleNotify		},
     { "packageAdd",		package_add		},
-    { "system",			(int (*)(char *))system	},
+    { "system",			(int (*)(char *))vsystem },
     { "systemInteractive",	systemExecute		},
     { "tcpInstallDevice",	tcpInstallDevice	},
     { NULL, NULL },