Various tweaks to adjust things more to my liking. Also bring in Rich's

changes to update XFree86 to 3.1.2-S.

3 files changed, 20 insertions, 16 deletions

diff --git a/release/sysinstall/doc.c b/release/sysinstall/doc.c
index ef5be2f..a52c659 100644
--- a/release/sysinstall/doc.c
+++ b/release/sysinstall/doc.c
@@ -4,16 +4,12 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: doc.c,v 1.7 1995/10/27 01:22:53 jkh Exp $
+ * $Id: doc.c,v 1.8 1995/10/27 03:59:31 jkh Exp $
  *
  * Jordan Hubbard
  *
  * My contributions are in the public domain.
  *
- * Parts of this file are also blatently stolen from Poul-Henning Kamp's
- * previous version of sysinstall, and as such fall under his "BEERWARE license"
- * so buy him a beer if you like it!  Buy him a beer for me, too!
- * Heck, get him completely drunk and send me pictures! :-)
  */
 
 #include "sysinstall.h"
@@ -26,7 +22,13 @@ int
 docBrowser(char *junk)
 {
     char *browser = variable_get(VAR_BROWSER_PACKAGE);
- 
+
+    if (!strstr(variable_get(SYSTEM_STATE), "install")) {
+	msgConfirm("This option may only be used after the system is installed, sorry!");
+	return RET_FAIL;
+    }
+
+    /* Make sure we have media available */
     if (!mediaVerify())
 	return RET_FAIL;
 
diff --git a/release/sysinstall/freebsd.cfg b/release/sysinstall/freebsd.cfg
index 5cb9237..4652d1f 100644
--- a/release/sysinstall/freebsd.cfg
+++ b/release/sysinstall/freebsd.cfg
@@ -14,6 +14,11 @@ netmask=255.255.255.240
 
 # Which installation device to use - ftp is pointed directly at my local
 # machine and the installation device is my PC CARD ethernet interface.
+# the "script" keyword lets mediaSetFTP know that it's being run from
+# a script and shouldn't prompt the user for extra details.  If you *want*
+# it to prompt, you can pass it either "express", "novice" or "custom"
+# to set the level of detail for such prompting.  This is a general convention
+# which you'll see elsewhere in this script file.
 ftp=ftp://time.cdrom.com/pub
 mediaSetFTP=script
 tcpInstallDevice=ze0
@@ -23,10 +28,8 @@ distSetUser
 
 # Now set the parameters for the partition editor.  Set to use all remaining
 # free space (could also be "all" or "existing" to use all the disk or an
-# existing FreeBSD slice.  When the "script" parameter is passed to the
-# disk Partition Editor, it knows it's being run non-interactively.  Also,
-# since we have a DOS slice, we know the FreeBSD slice is slice 2.  This is
-# important to know for the label stage!
+# existing FreeBSD slice).  Pass the script parameter to diskPartitionEditor
+# so it's not interactive, as described above.
 disk=wd0
 diskSpace=free
 bootManager=booteasy
@@ -35,8 +38,9 @@ diskPartitionEditor=script
 # It's bogus that we have to re-enter the label editor for each partition
 # we want to create, but it was easier to do it this way (from a programming
 # standpoint, not a user standpoint!).  This assumes that slice 1 is a DOS
-# partition and mounts it as /dos.  We also create a root partition of 20MB
-# size on the same pass since it's in a different slice.
+# partition and mounts it as /dos, which is the case on my laptop.
+# We can also create a root partition of 20MB in size on the same pass since
+# it's in a different slice (s2).  All sizes are expressed in 512 byte blocks!
 wd0s1=/dos N
 wd0s2=partition 40960 /
 diskLabelEditor=script
@@ -51,3 +55,4 @@ diskLabelEditor=script
 
 # OK, everything is set.  Do it!
 installCommit=script
+
diff --git a/release/sysinstall/installUpgrade.c b/release/sysinstall/installUpgrade.c
index da8641d..ff3b120 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.12 1995/10/27 03:59:38 jkh Exp $
+ * $Id: installUpgrade.c,v 1.13 1995/11/03 12:02:36 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -222,9 +222,6 @@ installUpgrade(char *str)
 	    return RET_FAIL;
     }
 
-    /* Note that we're now upgrading */
-    variable_set2(SYSTEM_STATE, "upgrade");
-
     dialog_clear();
     msgConfirm("OK.  First, we're going to go to the disk label editor.  In this editor\n"
 	       "you will be expected to *Mount* any partitions you're interested in\n"