Sync up my work for the night. This should implement ALL possible

installation methods and provide a fairly robust set of menu options.
This should also fix a few more bugs on Poul-Henning's latest gripe
list.

1 files changed, 21 insertions, 19 deletions

diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 83b47c2..a2cd6c3 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: menus.c,v 1.36 1995/05/28 23:12:07 jkh Exp $
+ * $Id: menus.c,v 1.37 1995/05/29 01:43:17 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -302,12 +302,14 @@ method.",
 	DMENU_CALL,	mediaSetCDROM, 0, 0		},
       { "DOS", "Install from a DOS partition",
 	DMENU_CALL,	mediaSetDOS, 0, 0		},
-      { "File System", "Install from a UFS or NFS mounted distribution",
-	DMENU_CALL,	mediaSetFS, 0, 0		},
+      { "File System", "Install from a mounted filesystem",
+	DMENU_CALL,	mediaSetUFS, 0, 0		},
       { "Floppy", "Install from a floppy disk set",
 	DMENU_CALL,	mediaSetFloppy, 0, 0		},
       { "FTP", "Install from an Internet FTP server",
 	DMENU_CALL,	mediaSetFTP, 0, 0		},
+      { "NFS",		"Install over NFS",
+	DMENU_CALL,	mediaSetNFS, 0, 0		},
       { "Tape", "Install from SCSI or QIC tape",
 	DMENU_CALL,	mediaSetTape, 0, 0		},
       { NULL } },
@@ -642,7 +644,7 @@ When you're done, select Cancel",
     "Press F1 for more information on these options",
     "configure.hlp",
     { { "Add User",	"Add users to the system",
-	DMENU_SYSTEM_COMMAND, "adduser", 0, 0			},
+	DMENU_SYSTEM_COMMAND, "adduser -silent", 0, 0		},
       { "Console",	"Customize system console behavior",
 	DMENU_SUBMENU, &MenuSyscons, 0, 0			},
       { "Networking",	"Configure additional network services",
@@ -700,11 +702,11 @@ close to you to have your system time syncronized accordingly.",
 	DMENU_SET_VARIABLE,	"ntpdate=canon.inria.fr", 0, 0		},
       { "Germany",		"ntps1-{0,1,2}.uni-erlangen.de (GPS)",
 	DMENU_SET_VARIABLE,	"ntpdate=ntps1-0.uni-erlangen.de", 0, 0	},
-      { "Germany",		"ntps1-0.cs.tu-berlin.de (GPS)",
+      { "Germany #2",		"ntps1-0.cs.tu-berlin.de (GPS)",
 	DMENU_SET_VARIABLE,	"ntpdate=ntps1-0.cs.tu-berlin.de", 0, 0	},
       { "Japan",		"clock.nc.fukuoka-u.ac.jp (GPS clock)",
 	DMENU_SET_VARIABLE,	"ntpdate=clock.nc.fukuoka-u.ac.jp", 0, 0},
-      { "Japan",		"clock.tl.fukuoka-u.ac.jp (GPS clock)",
+      { "Japan #2",		"clock.tl.fukuoka-u.ac.jp (GPS clock)",
 	DMENU_SET_VARIABLE,	"ntpdate=clock.tl.fukuoka-u.ac.jp", 0, 0},
       { "Netherlands",		"ntp0.nl.net (GPS clock)",
 	DMENU_SET_VARIABLE,	"ntpdate=ntp0.nl.net", 0, 0		},
@@ -716,20 +718,20 @@ close to you to have your system time syncronized accordingly.",
 	DMENU_SET_VARIABLE,	"ntpdate=swisstime.ethz.ch", 0, 0	},
       { "U.S. East Coast",	"bitsy.mit.edu (WWV clock)",
 	DMENU_SET_VARIABLE,	"ntpdate=bitsy.mit.edu", 0, 0		},
-      { "U.S. East Coast",	"otc1.psu.edu (WWV clock)",
+      { "U.S. East Coast #2",	"otc1.psu.edu (WWV clock)",
 	DMENU_SET_VARIABLE,	"ntpdate=otc1.psu.edu", 0, 0		},
       { "U.S. West Coast",	"apple.com (WWV clock)",
 	DMENU_SET_VARIABLE,	"ntpdate=apple.com", 0, 0		},
-      { "U.S. West Coast",	"clepsydra.dec.com (GOES clock)",
+      { "U.S. West Coast #2",	"clepsydra.dec.com (GOES clock)",
 	DMENU_SET_VARIABLE,	"ntpdate=clepsydra.dec.com", 0, 0	},
-      { "U.S. West Coast",	"clock.llnl.gov (WWVB clock)",
-	DMENU_SET_VARIABLE,	"ntpdate=clock.llnl.gov", 0, 0	},
+      { "U.S. West Coast #3",	"clock.llnl.gov (WWVB clock)",
+	DMENU_SET_VARIABLE,	"ntpdate=clock.llnl.gov", 0, 0		},
       { "U.S. Midwest",		"ncar.ucar.edu (WWVB clock)",
-	DMENU_SET_VARIABLE,	"ntpdate=ncar.ucar.edu", 0, 0		},	
+	DMENU_SET_VARIABLE,	"ntpdate=ncar.ucar.edu", 0, 0		},
       { "U.S. Pacific",		"chantry.hawaii.net (WWV/H clock)",
 	DMENU_SET_VARIABLE,	"ntpdate=chantry.hawaii.net", 0, 0	},
       { "U.S. Southwest",	"shorty.chpc.utexas.edu (WWV clock)",
-	DMENU_SET_VARIABLE,	"ntpdate=shorty.chpc.utexas.edu", 0, 0	},	
+	DMENU_SET_VARIABLE,	"ntpdate=shorty.chpc.utexas.edu", 0, 0	},
       { NULL } },
 };
 
@@ -738,9 +740,9 @@ DMenu MenuSyscons = {
     "System Console Configuration",
     "The default system console driver for FreeBSD (syscons) has a\n\
 number of configuration options which may be set according to\n\
-your preference.  When you are done setting configuration options,\n\
-select Cancel.",
-    "Configure your screen saver settings",
+your preference.\n\n\
+When you are done setting configuration options, select Cancel.",
+    "Configure your system console settings",
     NULL,
     { { "Keymap", "Choose an alternate keyboard map",
 	DMENU_SUBMENU, &MenuSysconsKeymap, 0, 0		},
@@ -798,9 +800,9 @@ when held down.",
     NULL,
     { { "Slow", "Slow keyboard repeat rate",
 	DMENU_SET_VARIABLE, "keyrate=slow", 0, 0		},
-      { "Normal", "\"normal\" keyboard repeat rate",
+      { "Normal", "\"Normal\" keyboard repeat rate",
 	DMENU_SET_VARIABLE, "keyrate=normal", 0, 0		},
-      { "Fast", "fast keyboard repeat rate",
+      { "Fast", "Fast keyboard repeat rate",
 	DMENU_SET_VARIABLE, "keyrate=fast", 0, 0		},
       { "Default", "Use default keyboard repeat rate",
 	DMENU_SET_VARIABLE, "keyrate=NO", 0, 0			},
@@ -818,11 +820,11 @@ probably enable one of these screen savers to prevent phosphor burn-in.",
     NULL,
     { { "blank", "Simply blank the screen",
 	DMENU_SET_VARIABLE, "saver=star", 0, 0		},
-      { "Green", "\"green\" power saving mode (if supported by monitor)",
+      { "Green", "\"Green\" power saving mode (if supported by monitor)",
 	DMENU_SET_VARIABLE, "saver=snake", 0, 0		},
       { "Snake", "Draw a FreeBSD \"snake\" on your screen",
 	DMENU_SET_VARIABLE, "saver=snake", 0, 0		},
-      { "Star",	"\"twinkling stars\" effect",
+      { "Star",	"A \"twinkling stars\" effect",
 	DMENU_SET_VARIABLE, "saver=star", 0, 0		},
       { "Timeout", "Set the screen saver timeout interval",
 	DMENU_CALL, configSaverTimeout, 0, 0		},