Index: menus.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/sysinstall/menus.c,v
retrieving revision 1.368
diff -u -r1.368 menus.c
--- menus.c	2003/02/03 16:14:33	1.368
+++ menus.c	2003/02/06 09:23:43
@@ -1481,17 +1481,17 @@
     "configure",
     { { "X Exit",		"Exit this menu (returning to previous)",
 	NULL,	dmenuExit },
-      { " Distributions", "Install additional distribution sets",
+      { "Distributions", "Install additional distribution sets",
 	NULL, distExtractAll },
       { " Packages",	"Install pre-packaged software for FreeBSD",
 	NULL, configPackages },
       { " Root Password", "Set the system manager's password",
 	NULL,	dmenuSystemCommand, NULL, "passwd root" },
 #ifdef WITH_SLICES
-      { " Fdisk",	"The disk Slice (PC-style partition) Editor",
+      { "Fdisk",	"The disk Slice (PC-style partition) Editor",
 	NULL, diskPartitionEditor },
 #endif
-      { " Label",	"The disk Label editor",
+      { "Label",	"The disk Label editor",
 	NULL, diskLabelEditor },
       { " User Management",	"Add user and group information",
 	NULL, dmenuSubmenu, NULL, &MenuUsermgmt },
@@ -1501,18 +1501,22 @@
 #endif
       { " Time Zone",	"Set which time zone you're in",
 	NULL,	dmenuSystemCommand, NULL, "tzsetup" },
-      { " Media",	"Change the installation media type",
+      { "Media",	"Change the installation media type",
 	NULL,	dmenuSubmenu, NULL, &MenuMedia },
 #ifdef WITH_MICE
       { " Mouse",	"Configure your mouse",
 	NULL,	dmenuSubmenu, NULL, &MenuMouse, NULL },
 #endif
-      { " Networking",	"Configure additional network services",
+      { "Networking",	"Configure additional network services",
 	NULL,	dmenuSubmenu, NULL, &MenuNetworking },
       { " Security",	"Configure system security options",
 	NULL,	dmenuSubmenu, NULL, &MenuSecurity },
       { " Startup",	"Configure system startup options",
 	NULL,	dmenuSubmenu, NULL, &MenuStartup },
+#if defined(__i386__) || defined(__ia64__)
+      { " Power Management",	"Configure ACPI/APM subsystem",
+	NULL,	dmenuSubmenu, NULL, &MenuPowerMgmt },
+#endif
       { " TTYs",	"Configure system ttys.",
 	NULL,	configEtcTtys, NULL, "ttys" },
       { " Options",	"View/Set various installation options",
@@ -1538,10 +1542,6 @@
     NULL,
     { { "X Exit",	"Exit this menu (returning to previous)",
 	checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
-#ifdef __i386__
-      { " APM",		"Auto-power management services (typically laptops)",
-	dmenuVarCheck,	dmenuToggleVariable, NULL, "apm_enable=YES" },
-#endif
 #ifdef PCCARD_ARCH
       { " pccard",	"Enable PCCARD (AKA PCMCIA) services (also laptops)",
 	dmenuVarCheck, dmenuToggleVariable, NULL, "pccard_enable=YES" },
@@ -1586,11 +1586,33 @@
       { " OSF/1",	"This host wants to be able to run DEC OSF/1 binaries.",
 	dmenuVarCheck, configOSF1, NULL, VAR_OSF1_ENABLE "=YES" },
 #endif
-      { " quotas",	"This host wishes to check quotas on startup.",
+      { " Quotas",	"This host wishes to check quotas on startup.",
 	dmenuVarCheck, dmenuToggleVariable, NULL, "check_quotas=YES" },
       { NULL } },
 };
 
+#if defined(__i386__) || defined(__ia64__)
+DMenu MenuPowerMgmt = {
+    DMENU_NORMAL_TYPE,
+    "Power Management Services",
+    "Two types of power management services are offered with FreeBSD:\n"
+    "- ACPI (Advanced Configuration and Power Interface) is the modern\n"
+    "  power management and device enumeration system.  It is enabled by\n"
+    "  default.  Although some systems have trouble with it due to bad\n"
+    "  vendor configurations or bugs in the ACPI BIOS, thus not allowing\n"
+    "  you to boot FreeBSD.\n\n"
+    "- APM (Advanced Power Management) is the old power management system\n"
+    "  that has been around since FreeBSD 4.X.  ACPI and APM are mutually\n"
+    "  exlusive, please choose one or another.\n\n",
+    NULL,
+    NULL,
+{ { "X Exit",	"Exit this menu (returning to previous)",	NULL, dmenuExit },
+  { "1 ACPI",	"Enable ACPI (and disable APM) ",	NULL, configACPI },
+  { "2 APM",	"Enable APM  (and disable ACPI)",	NULL, configAPM },
+  { NULL } },
+};
+#endif
+
 DMenu MenuNetworking = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
     "Network Services Menu",
@@ -1754,12 +1776,12 @@
       { "Spain",		"slug.ctv.es",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
 	"ntpdate_enable=YES,ntpdate_flags=slug.ctv.es" },
-      { "Finland",		"tick.keso.fi",
+      { "Finland",		"time1.mikes.fi",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=tick.keso.fi" },
-      { "Finland #2",		"tock.keso.fi",
+	"ntpdate_enable=YES,ntpdate_flags=time1.mikes.fi" },
+      { "Finland #2",		"time2.mikes.fi",
 	dmenuVarsCheck, dmenuSetVariables, NULL,
-	"ntpdate_enable=YES,ntpdate_flags=tock.keso.fi" },
+	"ntpdate_enable=YES,ntpdate_flags=time2.mikes.fi" },
       { "France",		"ntp.obspm.fr",
 	dmenuVarsCheck,	dmenuSetVariables, NULL, 
 	"ntpdate_enable=YES,ntpdate_flags=ntp.obspm.fr" },