Sync up with Poul.

1 files changed, 159 insertions, 12 deletions

diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 7dee248..dc256d4 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.33 1995/05/26 19:28:03 jkh Exp $
+ * $Id: menus.c,v 1.34 1995/05/27 10:47:38 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -643,8 +643,10 @@ When you're done, select Cancel",
     "configure.hlp",
     { { "Add User",	"Add users to the system",
 	DMENU_SYSTEM_COMMAND, "adduser", 0, 0			},
-      { "Networking",	"Configure additional network devices",
-	DMENU_CALL, 	tcpDeviceSelect, 0, 0			},
+      { "Console",	"Customize system console behavior",
+	DMENU_SUBMENU, &MenuSyscons, 0, 0			},
+      { "Networking",	"Configure additional network services",
+	DMENU_SUBMENU, 	&MenuNetworking, 0, 0			},
       { "Time Zone",	"Set which time zone you're in",
 	DMENU_SYSTEM_COMMAND, "tzsetup", 0, 0			},
       { "Packages",	"Install extra FreeBSD packaged software",
@@ -653,15 +655,86 @@ When you're done, select Cancel",
 	DMENU_CALL,	configPorts, 0, 1			},
       { "Root Password", "Set the system manager's password",
 	DMENU_SYSTEM_COMMAND, "passwd root", 0, 0		},
-      { "Screen",	"Customize system console behavior",
-	DMENU_SUBMENU, &MenuSyscons, 0, 0			},
-      { "Sysconfig",	"Edit the system configuration file (with vi)",
-	DMENU_SYSTEM_COMMAND, "vi /etc/sysconfig", 0, 0		},
       { "XFree86",	"Configure XFree86 (if installed)",
 	DMENU_SYSTEM_COMMAND, "PATH=/usr/bin:/bin:/usr/X11R6/bin xf86config", 0, 0 },
       { NULL } },
 };
 
+DMenu MenuNetworking = {
+    DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
+    "Network Services Menu",
+    "You may have already configured one network device (and the\n\
+other various hostname/gateway/name server parameters) in the process\n\
+of installing FreeBSD.  This menu allows you to configure other\n\
+aspects of your system's network configuration.",
+    NULL,
+    NULL,
+    { { "NFS client",	"This machine will be an NFS client",
+	DMENU_SET_VARIABLE, "nfs_client=YES", 0, 0		},
+      { "NFS server",	"This machine will be an NFS server",
+	DMENU_SET_VARIABLE, "nfs_server=YES", 0, 0		},
+      { "gated",	"This machine wants to run gated",
+	DMENU_SET_VARIABLE, "gated=YES", 0, 0			},
+      { "interfaces",	"Configure additional interfaces",
+	DMENU_CALL,	tcpDeviceSelect, 0, 0			},
+      { "ntpdate",	"Select a clock-syncronization server",
+	DMENU_SUBMENU,	&MenuNTP, 0, 0				},
+      { "routed",	"Set flags for routed (default: -q)",
+	DMENU_CALL,	configRoutedFlags, 0, 0			},
+      { "rwhod",	"This machine wants to run the rwho daemon",
+	DMENU_SET_VARIABLE, "rwhod=YES", 0, 0			},
+      { NULL } },
+};
+
+DMenu MenuNTP = {
+    DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
+    "NTPDATE Server Selection",
+    "There are a number of time syncronization servers available\n\
+for public use around the Internet.  Please select one reasonably\n\
+close to you to have your system time syncronized accordingly.",
+    "These are the primary open-access NTP servers",
+    NULL,
+    { { "Australia",		"ntp.syd.dms.csiro.au (HP 5061 Cesium Beam)",
+	DMENU_SET_VARIABLE,	"ntpdate=ntp.syd.dms.csiro.au", 0, 0	},
+      { "Canada",		"tick.usask.ca (GOES clock)",
+	DMENU_SET_VARIABLE,	"ntpdate=tick.usask.ca", 0, 0		},
+      { "France",		"canon.inria.fr (TDF clock)",
+	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)",
+	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)",
+	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		},
+      { "Norway",		"timer.unik.no (NTP clock)",
+	DMENU_SET_VARIABLE,	"ntpdate=timer.unik.no", 0, 0		},
+      { "Sweden",		"Time1.Stupi.SE (Cesium/GPS)",
+	DMENU_SET_VARIABLE,	"ntpdate=Time1.Stupi.SE", 0, 0		},
+      { "Switzerland",		"swisstime.ethz.ch (DCF77 clock)",
+	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)",
+	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)",
+	DMENU_SET_VARIABLE,	"ntpdate=clepsydra.dec.com", 0, 0	},
+      { "U.S. West Coast",	"clock.llnl.gov (WWVB clock)",
+	DMENU_SET_VARIABLE,	"ntpdate=clepsydra.dec.com", 0, 0	},
+      { "U.S. Midwest",		"ncar.ucar.edu (WWVB clock)",
+	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	},	
+      { NULL } },
+};
+
 DMenu MenuSyscons = {
     DMENU_NORMAL_TYPE,
     "System Console Configuration",
@@ -671,15 +744,89 @@ your preference.  When you are done setting configuration options,\n\
 select Cancel.",
     "Configure your screen saver settings",
     NULL,
-    { { "blank", "Screen-blanking saver",
+    { { "Keymap", "Choose an alternate keyboard map",
+	DMENU_SUBMENU, &MenuSysconsKeymap, 0, 0		},
+      { "Repeat", "Set the rate at which keys repeat",
+	DMENU_SUBMENU, &MenuSysconsKeyrate, 0, 0	},
+      { "Saver", "Select a screen saver",
+	DMENU_SUBMENU, &MenuSysconsSaver, 0, 0		},
+      { NULL } },
+};
+
+DMenu MenuSysconsKeymap = {
+    DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
+    "System Console Keymap",
+    "The default system console driver for FreeBSD (syscons) defaults\n\
+to a standard \"American\" keyboard map.  Users in other countries\n\
+(or with different keyboard preferences) may wish to choose one of\n\
+the other keymaps below.",
+    "Choose a keyboard map",
+    NULL,
+    { { "Danish CP865", "Danish Code Page 865 keymap",
+	DMENU_SET_VARIABLE, "keymap=danish.cp865", 0, 0		},
+      { "Danish ISO", "Danish ISO keymap",
+	DMENU_SET_VARIABLE, "keymap=danish.iso", 0, 0		},
+      { "French ISO", "French ISO keymap",
+	DMENU_SET_VARIABLE, "keymap=fr.iso", 0, 0		},
+      { "German CP850", "German Code Page 850 keymap",
+	DMENU_SET_VARIABLE, "keymap=german.cp850", 0, 0		},
+      { "German ISO", "German ISO keymap",
+	DMENU_SET_VARIABLE, "keymap=german.iso", 0, 0		},
+      { "Russian CP866", "Russian Code Page 866 keymap",
+	DMENU_SET_VARIABLE, "keymap=ru.cp866", 0, 0		},
+      { "Russian KOI8", "Russian koi8 keymap",
+	DMENU_SET_VARIABLE, "keymap=ru.koi8-r", 0, 0		},
+      { "Russian s-KOI8", "Russian shifted koi8 keymap",
+	DMENU_SET_VARIABLE, "keymap=ru.koi8-r.shift", 0, 0	},
+      { "Swedish CP850", "Swedish Code Page 850 keymap",
+	DMENU_SET_VARIABLE, "keymap=swedish.cp850", 0, 0	},
+      { "Swedish ISO", "Swedish ISO keymap",
+	DMENU_SET_VARIABLE, "keymap=swedish.iso", 0, 0		},
+      { "U.K. CP850", "United Kingdom Code Page 850 keymap",
+	DMENU_SET_VARIABLE, "keymap=uk.cp850.iso", 0, 0		},
+      { "U.K. ISO", "United Kingdom ISO keymap",
+	DMENU_SET_VARIABLE, "keymap=uk.iso", 0, 0		},
+      { "U.S. ISO", "United States ISO keymap",
+	DMENU_SET_VARIABLE, "keymap=us.iso", 0, 0		},
+      { NULL } },
+};
+
+DMenu MenuSysconsKeyrate = {
+    DMENU_NORMAL_TYPE,
+    "System Console Keyboard Repeat Rate",
+    "This menu allows you to set the speed at which keys repeat\n\
+when held down.",
+    "Choose a keyboard repeat rate",
+    NULL,
+    { { "Slow", "Slow keyboard repeat rate",
+	DMENU_SET_VARIABLE, "keyrate=slow", 0, 0		},
+      { "Normal", "\"normal\" keyboard repeat rate",
+	DMENU_SET_VARIABLE, "keyrate=normal", 0, 0		},
+      { "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			},
+      { NULL } },
+};
+
+DMenu MenuSysconsSaver = {
+    DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
+    "System Console Screen Saver",
+    "By default, the console driver will not attempt to do anything\n\
+special with your screen when it's idle.  If you expect to leave your\n\
+monitor switched on and idle for long periods of time then you should\n\
+probably enable one of these screen savers to prevent phosphor burn-in.",
+    "Choose a nifty-looking screen saver",
+    NULL,
+    { { "blank", "Simply blank the screen",
 	DMENU_SET_VARIABLE, "saver=star", 0, 0		},
-      { "Green", "\"green\" power saver (if supported by monitor)",
+      { "Green", "\"green\" power saving mode (if supported by monitor)",
 	DMENU_SET_VARIABLE, "saver=snake", 0, 0		},
-      { "Snake", "\"snake\" screen saver",
+      { "Snake", "Draw a FreeBSD \"snake\" on your screen",
 	DMENU_SET_VARIABLE, "saver=snake", 0, 0		},
-      { "Star",	"\"twinkling stars\" screen saver",
+      { "Star",	"\"twinkling stars\" effect",
 	DMENU_SET_VARIABLE, "saver=star", 0, 0		},
-      { "Timeout", "Set screen saver timeout interval",
+      { "Timeout", "Set the screen saver timeout interval",
 	DMENU_CALL, configSaverTimeout, 0, 0		},
       { NULL } },
 };