Reshuffle a number of menus to be more navigable. Delete extra

Root Password entry (PR#9291 - Jack O'Neill).

1 files changed, 20 insertions, 21 deletions

diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c
index 20d5471..9eb4d57 100644
--- a/release/sysinstall/menus.c
+++ b/release/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.185 1999/02/05 22:15:50 jkh Exp $
+ * $Id: menus.c,v 1.186 1999/02/06 08:45:20 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -270,7 +270,6 @@ DMenu MenuIndex = {
       { "PCNFSD",		"Run authentication server for PC-NFS.", dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" },
       { "Register",		"Register yourself or company as a FreeBSD user.", dmenuVarCheck, configRegister, NULL, "registered" },
       { "Root Password",	"Set the system manager's password.",   NULL, dmenuSystemCommand, NULL, "passwd root" },
-      { "Root Password",	"Set the system manager's password.",   NULL, dmenuSystemCommand, NULL, "passwd root" },
       { "Router",		"Select routing daemon (default: routed)", NULL, configRouter, NULL, "router" },
       { "Syscons",		"The system console configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSyscons },
       { "Syscons, Font",	"The console screen font.",	  NULL, dmenuSubmenu, NULL, &MenuSysconsFont },
@@ -301,17 +300,17 @@ DMenu MenuInitial = {
     { { "Select" },
       { "Exit Install",	NULL, NULL, dmenuExit },
       { "1 Usage",	"Quick start - How to use this menu system",	NULL, dmenuDisplayFile, NULL, "usage" },
-      { "2 Doc",	"Installation instructions, README, etc.",	NULL, dmenuSubmenu, NULL, &MenuDocumentation },
-      { "3 Keymap",	"Select keyboard type",				NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap },
-      { "4 Options",	"View/Set various installation options",	NULL, optionsEditor },
+      { "2 Novice",	"Begin a novice installation (for beginners)",	NULL, installNovice },
+      { "3 Express",	"Begin a quick installation (for the impatient)", NULL, installExpress },
+      { "4 Custom",	"Begin a custom installation (for experts)",	NULL, dmenuSubmenu, NULL, &MenuInstallCustom },
       { "5 Configure",	"Do post-install configuration of FreeBSD",	NULL, dmenuSubmenu, NULL, &MenuConfigure },
-      { "6 Novice",	"Begin a novice installation (for beginners)",	NULL, installNovice },
-      { "7 Express",	"Begin a quick installation (for the impatient)", NULL, installExpress },
-      { "8 Custom",	"Begin a custom installation (for experts)",	NULL, dmenuSubmenu, NULL, &MenuInstallCustom },
-      { "9 Fixit",	"Enter repair mode with CDROM/floppy or start shell",	NULL, dmenuSubmenu, NULL, &MenuFixit },
+      { "D Doc",	"Installation instructions, README, etc.",	NULL, dmenuSubmenu, NULL, &MenuDocumentation },
+      { "K Keymap",	"Select keyboard type",				NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap },
+      { "O Options",	"View/Set various installation options",	NULL, optionsEditor },
+      { "F Fixit",	"Enter repair mode with CDROM/floppy or start shell",	NULL, dmenuSubmenu, NULL, &MenuFixit },
       { "U Upgrade",	"Upgrade an existing system",			NULL, installUpgrade },
       { "L Load Config","Load default install configuration",		NULL, dispatch_load_floppy },
-      { "0 Index",	"Glossary of functions",			NULL, dmenuSubmenu, NULL, &MenuIndex },
+      { "I Index",	"Glossary of functions",			NULL, dmenuSubmenu, NULL, &MenuIndex },
       { NULL } },
 };
 
@@ -1117,7 +1116,17 @@ DMenu MenuConfigure = {
     "software not provided in the base distributions.",
     "Press F1 for more information on these options",
     "configure",
-    { { "1 User Management",	"Add user and group information",
+    { { "D Distributions", "Install additional distribution sets",
+	NULL, distExtractAll },
+      { "P Packages",	"Install pre-packaged software for FreeBSD",
+	NULL, configPackages },
+      { "R Root Password", "Set the system manager's password",
+	NULL,	dmenuSystemCommand, NULL, "passwd root" },
+      { "L Label",	"The disk Label editor",
+	NULL, diskLabelEditor },
+      { "F Fdisk",	"The disk Slice (PC-style partition) Editor",
+	NULL, diskPartitionEditor },
+      { "1 User Management",	"Add user and group information",
 	NULL, dmenuSubmenu, NULL, &MenuUsermgmt },
       { "2 Console",	"Customize system console behavior",
 	NULL,	dmenuSubmenu, NULL, &MenuSyscons },
@@ -1133,20 +1142,10 @@ DMenu MenuConfigure = {
 	NULL,	dmenuSubmenu, NULL, &MenuStartup },
       { "8 Options",	"View/Set various installation options",
 	NULL, optionsEditor },
-      { "9 Distributions", "Install additional distribution sets",
-	NULL, distExtractAll },
-      { "P Packages",	"Install pre-packaged software for FreeBSD",
-	NULL, configPackages },
-      { "R Root Password", "Set the system manager's password",
-	NULL,	dmenuSystemCommand, NULL, "passwd root" },
       { "D HTML Docs",	"Go to the HTML documentation menu (post-install)",
 	NULL, docBrowser },
       { "X XFree86",	"Configure XFree86",
 	NULL, configXEnvironment },
-      { "L Label",	"The disk Label editor",
-	NULL, diskLabelEditor },
-      { "F Fdisk",	"The disk Slice (PC-style partition) Editor",
-	NULL, diskPartitionEditor },
       { "U Register",	"Register yourself or company as a FreeBSD user.", NULL, configRegister },
       { "E Exit",		"Exit this menu (returning to previous)",
 	NULL,	dmenuExit },