This mega-commit brings in Jordan's latest sysinstall version..

This looks like it was developed offline, and is being spammed over the
top of the existing.  "That's fine by me!  I dont really care how you do
it, just get it in there..." said Jordan in a conversation a short while
ago...

1 files changed, 322 insertions, 358 deletions

diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 3cbafe0..87213fd 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.41.2.39 1995/06/10 19:38:27 jkh Exp $
+ * $Id: menus.c,v 1.42.2.3 1995/07/27 01:37:18 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -53,91 +53,53 @@
 /* The initial installation menu */
 DMenu MenuInitial = {
     DMENU_NORMAL_TYPE,
-    "Welcome to FreeBSD 2.0.5!",	/* title */
+    "Welcome to FreeBSD RELEASE_NAME!",	/* title */
     "This is the main menu of the FreeBSD installation system.  Please\n\
 select one of the options below by using the arrow keys or typing the\n\
 first character of the option name you're interested in.  Invoke an\n\
 option by pressing [ENTER].",		/* prompt */
     "Press F1 for usage instructions",				/* help line */
     "usage.hlp",						/* help file */
-    { { "Usage", "Quick start - How to use this menu system.",	/* U */
-	DMENU_DISPLAY_FILE,	"usage.hlp", 0, 0	},
-      { "Doc", "More detailed documentation on FreeBSD.",	/* D */
-	DMENU_SUBMENU,	&MenuDocumentation, 0, 0	},
-      { "Language", "Set your preferred language.",		/* L */
-	DMENU_SUBMENU,	&MenuOptionsLanguage, 0, 0	},
-      { "Options", "Select various options for this utility.",	/* O */
-	DMENU_SUBMENU,	&MenuOptions, 0, 0		},
-      { "Proceed", "Go to the installation menu",		/* P */
-	DMENU_SUBMENU,	&MenuInstall, 0, 0		},
-      { "Quit", "Exit this menu (and the installation)",	/* Q */
-	DMENU_CANCEL, NULL, 0, 0 },
+    { { "Usage",		"Quick start - How to use this menu system.",	/* U */
+	DMENU_DISPLAY_FILE,	"usage.hlp", 0, 0		},
+      { "Doc",			"More detailed documentation on FreeBSD.",	/* D */
+	DMENU_SUBMENU,		&MenuDocumentation, 0, 0	},
+      { "Options",		"Select various options for this utility.",	/* O */
+	DMENU_SUBMENU,		&MenuOptions, 0, 0		},
+      { "Custom",		"Begin a custom installation",			/* C */
+	DMENU_SUBMENU,		&MenuInstallCustom, 0, 0	},
+      { "Express",		"Begin a quick installation",			/* E */
+	DMENU_CALL,		&installExpress, 0, 0		},
+      { "Shell",		"Go to a shell for debugging or repair",
+	DMENU_SYSTEM_COMMAND,	"sh", 0, 0			},
+      { "Quit",			"Exit this menu (and the installation)",	/* Q */
+	DMENU_CANCEL,		NULL, 0, 0			},
       { NULL } },
 };
 
 /* The main documentation menu */
 DMenu MenuDocumentation = {
     DMENU_NORMAL_TYPE,
-    "Documentation for FreeBSD 2.0.5",	/* Title */
+    "Documentation for FreeBSD RELEASE_NAME",	/* Title */
     "If you are at all unsure about the configuration of your hardware\n\
 or are looking to build a system specifically for FreeBSD, read the\n\
 Hardware guide!  New users should also read the Install document for\n\
 a step-by-step tutorial on installing FreeBSD.  For general information,\n\
 consult the README file.",
     "Confused?  Press F1 for help.",
-    "usage.hlp",			/* help file */
-    { { "README", "Read this for a general description of FreeBSD",	/* R */
+    "usage.hlp",
+    { { "README",		"Read this for a general description of FreeBSD",
 	DMENU_DISPLAY_FILE,	"README", 0, 0		},
-      { "Hardware", "The FreeBSD survival guide for PC hardware.",	/* H */
+      { "Hardware",		"The FreeBSD survival guide for PC hardware.",
 	DMENU_DISPLAY_FILE,	"hardware.hlp", 0, 0	},
-      { "Install", "A step-by-step guide to installing FreeBSD.",	/* I */
+      { "Install",		"A step-by-step guide to installing FreeBSD.",
 	DMENU_DISPLAY_FILE,	"install.hlp", 0, 0	},
-      { "Copyright", "The FreeBSD Copyright notices.",   		/* C */
+      { "Copyright",		"The FreeBSD Copyright notices.",
 	DMENU_DISPLAY_FILE,	"COPYRIGHT", 0, 0	},
-      { "Release", "The release notes for this version of FreeBSD.",	/* R */
+      { "Release",		"The release notes for this version of FreeBSD.",
 	DMENU_DISPLAY_FILE,	"RELNOTES", 0, 0	},
-      { "Exit", "Exit this menu (returning to previous)",		/* E */
-	DMENU_CANCEL, NULL, 0, 0 },
-      { NULL } },
-};
-
-/*
- * The language selection menu.
- */
-DMenu MenuOptionsLanguage = {
-    DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
-    "Natural language selection",	/* title */
-    "Please specify the language you would like to use by default.\n\n\
-While almost all of the system's documentation is still written\n\
-in english (and may never be translated), there are a few guides\n\
-and types of system documentation that may be written in your\n\
-preferred language.  When such are found, they will be used instead\n\
-of the english versions.  This feature is nonetheless considered\n\
-to be in experimental status at this time.",		/* prompt */
-    "Press F1 for more information",	/* help line */
-    "language.hlp",			/* help file */
-    { { "Danish", "Danish language and character set (ISO-8859-1)",	/* D */
-	DMENU_CALL,	lang_set_Danish, 0, 0	},
-      { "Dutch", "Dutch language and character set (ISO-8859-1)",	/* D */
-	DMENU_CALL,	lang_set_Dutch, 0, 0	},
-      { "English", "English language (system default)",			/* E */
-	DMENU_CALL,	lang_set_English, 0, 0	},
-      { "French", "French language and character set (ISO-8859-1)",	/* F */
-	DMENU_CALL,	lang_set_French, 0, 0	},
-      { "German", "German language and character set (ISO-8859-1)",	/* G */
-	DMENU_CALL,	lang_set_German, 0, 0	},
-      { "Italian", "Italian language and character set (ISO-8859-1)",	/* I */
-	DMENU_CALL,	lang_set_Italian, 0, 0	},
-      { "Japanese", "Japanese language and default character set (romaji)", /* J */
-	DMENU_CALL,	lang_set_Japanese, 0, 0	},
-      { "Norwegian", "Norwegian language and character set (ISO-8859-1)", /* N */
-	DMENU_CALL,	lang_set_Norwegian, 0, 0},
-      { "Russian", "Russian language and character set (KOI8-R)",	/* R */
-	DMENU_CALL,	lang_set_Russian, 0, 0	},
-      { "Spanish", "Spanish language and character set (ISO-8859-1)",	/* S */
-	DMENU_CALL,	lang_set_Spanish, 0, 0	},
-      { "Swedish", "Swedish language and character set (ISO-8859-1)",	/* S */
-	DMENU_CALL,	lang_set_Swedish, 0, 0	},
+      { "Exit",			"Exit this menu (returning to previous)",
+	DMENU_CANCEL,		NULL, 0, 0		},
       { NULL } },
 };
 
@@ -145,7 +107,7 @@ DMenu MenuMediaCDROM = {
     DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
     "Choose a CDROM type",
     "FreeBSD can be installed directly from a CDROM containing a valid\n\
-FreeBSD 2.0.5 distribution.  If you are seeing this menu it is because\n\
+FreeBSD RELEASE_NAME distribution.  If you are seeing this menu it is because\n\
 more than one CDROM drive was found on your system.  Please select one\n\
 of the following CDROM drives as your installation drive.",
     "Press F1 to read the installation guide",
@@ -192,70 +154,70 @@ You may also wish to investigate the options menu in case of trouble.\n\
 To specify a URL not in this list, chose \"other\".",
     "Select a site that's close!",
     "install.hlp",
-    { { "Primary Site",  "ftp.freebsd.org",
-	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.freebsd.org/pub/FreeBSD/2.0.5-RELEASE", 0, 0			},
-      { "Secondary Site", "freefall.cdrom.com",
-	DMENU_SET_VARIABLE,	"ftp=ftp://freefall.cdrom.com/pub/FreeBSD/2.0.5-RELEASE", 0, 0			},
-      { "Other", "Specify some other ftp site by URL",
+    { { "Primary Site",		"ftp.freebsd.org",
+	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.freebsd.org/pub/FreeBSD/RELEASE_NAME", 0, 0			},
+      { "Secondary Site",	"freefall.cdrom.com",
+	DMENU_SET_VARIABLE,	"ftp=ftp://freefall.cdrom.com/pub/FreeBSD/RELEASE_NAME", 0, 0			},
+      { "Other",		"Specify some other ftp site by URL",
 	DMENU_SET_VARIABLE,	"ftp=other", 0, 0								},
-      { "Australia", "ftp.physics.usyd.edu.au",
-	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.physics.usyd.edu.au/FreeBSD/2.0.5-RELEASE", 0, 0			},
-      { "Finland", "nic.funet.fi",
-	DMENU_SET_VARIABLE,	"ftp=ftp://nic.funet.fi/pub/unix/FreeBSD/2.0.5-RELEASE", 0, 0			},
-      { "France", "ftp.ibp.fr",
-	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.ibp.fr/pub/FreeBSD/2.0.5-RELEASE", 0, 0				},
-      { "Germany", "ftp.fb9dv.uni-duisburg.de",
-	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.fb9dv.uni-duisburg.de/pub/unix/FreeBSD/2.0.5-RELEASE", 0, 0	},
-      { "Germany #2", "gil.physik.rwth-aachen.de",
-	DMENU_SET_VARIABLE,	"ftp=ftp://gil.physik.rwth-aachen.de/pub/FreeBSD/2.0.5-RELEASE", 0, 0		},
-      { "Germany #3", "ftp.uni-paderborn.de",
-	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.uni-paderborn.de/freebsd/2.0.5-RELEASE", 0, 0			},
-      { "Hong Kong", "ftp.hk.super.net",
-	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.hk.super.net/pub/FreeBSD/2.0.5-RELEASE", 0, 0			},
-      { "Israel", "orgchem.weizmann.ac.il",
-	DMENU_SET_VARIABLE,	"ftp=ftp://orgchem.weizmann.ac.il/pub/FreeBSD-2.0.5-RELEASE", 0, 0		},
-      { "Japan", "ftp.sra.co.jp",
-	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.sra.co.jp/pub/os/FreeBSD/2.0.5-RELEASE", 0, 0			},
-      { "Japan #2", "ftp.mei.co.jp",
-	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.mei.co.jp/free/PC-UNIX/FreeBSD/2.0.5-RELEASE", 0, 0		},
-      { "Japan #3", "ftp.waseda.ac.jp",
-	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.waseda.ac.jp/pub/FreeBSD/2.0.5-RELEASE", 0, 0			},
-      { "Japan #4", "ftp.pu-toyama.ac.jp",
-	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.pu-toyama.ac.jp/pub/FreeBSD/2.0.5-RELEASE", 0, 0			},
-      { "Japan #5", "ftpsv1.u-aizu.ac.jp",
-	DMENU_SET_VARIABLE,	"ftp=ftp://ftpsv1.u-aizu.ac.jp/pub/os/FreeBSD/2.0.5-RELEASE", 0, 0		},
-      { "Japan #6", "ftp.tut.ac.jp",
-	DMENU_SET_VARIABLE,	"ftp://ftp.tut.ac.jp/FreeBSD/2.0.5-RELEASE", 0, 0					},
-      { "Japan #7", "ftp.ee.uec.ac.jp",
-	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.ee.uec.ac.jp/pub/os/mirror/ftp.freebsd.org/2.0.5-RELEASE", 0, 0	},
-      { "Japan #8", "ftp.tokyonet.ad.jp",
-	DMENU_SET_VARIABLE,	"ftp://ftp.tokyonet.ad.jp/pub/FreeBSD/2.0.5-RELEASE", 0, 0			},
-      { "Korea", "ftp.cau.ac.kr",
-	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.cau.ac.kr/pub/FreeBSD/2.0.5-RELEASE", 0, 0				},
-      { "Netherlands", "ftp.nl.net",
-	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.nl.net/pub/os/FreeBSD/2.0.5-RELEASE", 0, 0				},
-      { "Russia", "ftp.kiae.su",
-	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.kiae.su/FreeBSD/2.0.5-RELEASE", 0, 0				},
-      { "Sweden", "ftp.luth.se",
-	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.luth.se/pub/FreeBSD/2.0.5-RELEASE", 0, 0				},
-      { "Taiwan", "netbsd.csie.nctu.edu.tw",
-	DMENU_SET_VARIABLE,	"ftp=ftp://netbsd.csie.nctu.edu.tw/pub/FreeBSD/2.0.5-RELEASE", 0, 0		},
-      { "Thailand", "ftp.nectec.or.th",
-	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.nectec.or.th/pub/FreeBSD/2.0.5-RELEASE", 0, 0			},
-      { "UK", "ftp.demon.co.uk",
-	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.demon.co.uk/pub/BSD/FreeBSD/2.0.5-RELEASE", 0, 0			},
-      { "UK #2", "src.doc.ic.ac.uk",
-	DMENU_SET_VARIABLE,	"ftp=ftp://src.doc.ic.ac.uk/packages/unix/FreeBSD/2.0.5-RELEASE", 0, 0		},
-      { "UK #3", "unix.hensa.ac.uk",
-	DMENU_SET_VARIABLE,	"ftp=ftp://unix.hensa.ac.uk/mirrors/walnut.creek/FreeBSD/2.0.5-RELEASE", 0, 0		},
-      { "USA", "ref.tfs.com",
-	DMENU_SET_VARIABLE,	"ftp=ftp://ref.tfs.com/pub/FreeBSD/2.0.5-RELEASE", 0, 0				},
-      { "USA #2", "ftp.dataplex.net",
-	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.dataplex.net/pub/FreeBSD/2.0.5-RELEASE", 0, 0			},
-      { "USA #3", "kryten.atinc.com",
-	DMENU_SET_VARIABLE,	"ftp=ftp://kryten.atinc.com/pub/FreeBSD/2.0.5-RELEASE", 0, 0			},
-      { "USA #4", "ftp.neosoft.com",
-	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.neosoft.com/systems/FreeBSD/2.0.5-RELEASE", 0, 0			},
+      { "Australia",		"ftp.physics.usyd.edu.au",
+	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.physics.usyd.edu.au/FreeBSD/RELEASE_NAME", 0, 0			},
+      { "Finland",		"nic.funet.fi",
+	DMENU_SET_VARIABLE,	"ftp=ftp://nic.funet.fi/pub/unix/FreeBSD/RELEASE_NAME", 0, 0			},
+      { "France",		"ftp.ibp.fr",
+	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.ibp.fr/pub/FreeBSD/RELEASE_NAME", 0, 0				},
+      { "Germany",		"ftp.fb9dv.uni-duisburg.de",
+	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.fb9dv.uni-duisburg.de/pub/unix/FreeBSD/RELEASE_NAME", 0, 0	},
+      { "Germany #2",		"gil.physik.rwth-aachen.de",
+	DMENU_SET_VARIABLE,	"ftp=ftp://gil.physik.rwth-aachen.de/pub/FreeBSD/RELEASE_NAME", 0, 0		},
+      { "Germany #3",		"ftp.uni-paderborn.de",
+	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.uni-paderborn.de/freebsd/RELEASE_NAME", 0, 0			},
+      { "Hong Kong",		"ftp.hk.super.net",
+	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.hk.super.net/pub/FreeBSD/RELEASE_NAME", 0, 0			},
+      { "Israel",		"orgchem.weizmann.ac.il",
+	DMENU_SET_VARIABLE,	"ftp=ftp://orgchem.weizmann.ac.il/pub/FreeBSD-RELEASE_NAME", 0, 0		},
+      { "Japan",		"ftp.sra.co.jp",
+	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.sra.co.jp/pub/os/FreeBSD/RELEASE_NAME", 0, 0			},
+      { "Japan #2",		"ftp.mei.co.jp",
+	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.mei.co.jp/free/PC-UNIX/FreeBSD/RELEASE_NAME", 0, 0		},
+      { "Japan #3",		"ftp.waseda.ac.jp",
+	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.waseda.ac.jp/pub/FreeBSD/RELEASE_NAME", 0, 0			},
+      { "Japan #4",		"ftp.pu-toyama.ac.jp",
+	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.pu-toyama.ac.jp/pub/FreeBSD/RELEASE_NAME", 0, 0			},
+      { "Japan #5",		"ftpsv1.u-aizu.ac.jp",
+	DMENU_SET_VARIABLE,	"ftp=ftp://ftpsv1.u-aizu.ac.jp/pub/os/FreeBSD/RELEASE_NAME", 0, 0		},
+      { "Japan #6",		"ftp.tut.ac.jp",
+	DMENU_SET_VARIABLE,	"ftp://ftp.tut.ac.jp/FreeBSD/RELEASE_NAME", 0, 0				},
+      { "Japan #7",		"ftp.ee.uec.ac.jp",
+	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.ee.uec.ac.jp/pub/os/mirror/ftp.freebsd.org/RELEASE_NAME", 0, 0	},
+      { "Japan #8",		"ftp.tokyonet.ad.jp",
+	DMENU_SET_VARIABLE,	"ftp://ftp.tokyonet.ad.jp/pub/FreeBSD/RELEASE_NAME", 0, 0			},
+      { "Korea",		"ftp.cau.ac.kr",
+	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.cau.ac.kr/pub/FreeBSD/RELEASE_NAME", 0, 0			},
+      { "Netherlands",		"ftp.nl.net",
+	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.nl.net/pub/os/FreeBSD/RELEASE_NAME", 0, 0			},
+      { "Russia",		"ftp.kiae.su",
+	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.kiae.su/FreeBSD/RELEASE_NAME", 0, 0				},
+      { "Sweden",		"ftp.luth.se",
+	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.luth.se/pub/FreeBSD/RELEASE_NAME", 0, 0				},
+      { "Taiwan",		"netbsd.csie.nctu.edu.tw",
+	DMENU_SET_VARIABLE,	"ftp=ftp://netbsd.csie.nctu.edu.tw/pub/FreeBSD/RELEASE_NAME", 0, 0		},
+      { "Thailand",		"ftp.nectec.or.th",
+	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.nectec.or.th/pub/FreeBSD/RELEASE_NAME", 0, 0			},
+      { "UK",			"ftp.demon.co.uk",
+	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.demon.co.uk/pub/BSD/FreeBSD/RELEASE_NAME", 0, 0			},
+      { "UK #2",		"src.doc.ic.ac.uk",
+	DMENU_SET_VARIABLE,	"ftp=ftp://src.doc.ic.ac.uk/packages/unix/FreeBSD/RELEASE_NAME", 0, 0		},
+      { "UK #3",		"unix.hensa.ac.uk",
+	DMENU_SET_VARIABLE,	"ftp=ftp://unix.hensa.ac.uk/mirrors/walnut.creek/FreeBSD/RELEASE_NAME", 0, 0	},
+      { "USA",			"ref.tfs.com",
+	DMENU_SET_VARIABLE,	"ftp=ftp://ref.tfs.com/pub/FreeBSD/RELEASE_NAME", 0, 0				},
+      { "USA #2",		"ftp.dataplex.net",
+	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.dataplex.net/pub/FreeBSD/RELEASE_NAME", 0, 0			},
+      { "USA #3",		"kryten.atinc.com",
+	DMENU_SET_VARIABLE,	"ftp=ftp://kryten.atinc.com/pub/FreeBSD/RELEASE_NAME", 0, 0			},
+      { "USA #4",		"ftp.neosoft.com",
+	DMENU_SET_VARIABLE,	"ftp=ftp://ftp.neosoft.com/systems/FreeBSD/RELEASE_NAME", 0, 0			},
       { NULL } }
 };
 
@@ -298,23 +260,25 @@ DMenu MenuMedia = {
     "FreeBSD can be installed from a variety of different installation\n\
 media, ranging from floppies to the Internet.  If you're installing\n\
 FreeBSD from a supported CDROM drive then this is generally the best\n\
-method to use unless you have some overriding reason for using another\n\
-method.",
+media to use, unless you have some overriding reason for using another\n\
+media.",
     "Press F1 for more information on the various media types",
     "media.hlp",
-    { { "CDROM", "Install from a FreeBSD CDROM",
+    { { "CDROM",	"Install from a FreeBSD CDROM",
 	DMENU_CALL,	mediaSetCDROM, 0, 0		},
-      { "DOS", "Install from a DOS partition",
+      { "DOS",		"Install from a DOS partition",
 	DMENU_CALL,	mediaSetDOS, 0, 0		},
-      { "File System", "Install from a mounted filesystem",
+      { "File System",	"Install from a mounted filesystem",
 	DMENU_CALL,	mediaSetUFS, 0, 0		},
-      { "Floppy", "Install from a floppy disk set",
+      { "Floppy",	"Install from a floppy disk set",
 	DMENU_CALL,	mediaSetFloppy, 0, 0		},
-      { "FTP", "Install from an Internet FTP server",
-	DMENU_CALL,	mediaSetFTP, 0, 0		},
+      { "FTP Active",	"Install from an FTP server in active mode",
+	DMENU_CALL,	mediaSetFTPActive, 0, 0		},
+      { "FTP Passive",	"Install from an FTP server in passive mode",
+	DMENU_CALL,	mediaSetFTPPassive, 0, 0	},
       { "NFS",		"Install over NFS",
 	DMENU_CALL,	mediaSetNFS, 0, 0		},
-      { "Tape", "Install from SCSI or QIC tape",
+      { "Tape",		"Install from SCSI or QIC tape",
 	DMENU_CALL,	mediaSetTape, 0, 0		},
       { NULL } },
 };
@@ -353,24 +317,18 @@ the list of distributions yourself, simply select \"custom\".",
 static char *
 DESFlagCheck(DMenuItem *item)
 {
-    if (isDebug())
-	msgDebug("Dists & DIST_DES = %d\n", Dists & DIST_DES);
     return (Dists & DIST_DES) ? "ON" : "OFF";
 }
 
 static char *
 srcFlagCheck(DMenuItem *item)
 {
-    if (isDebug())
-	msgDebug("Dists & DIST_SRC = %d\n", Dists & DIST_SRC);
     return (Dists & DIST_SRC) ? "ON" : "OFF";
 }
 
 static char *
 x11FlagCheck(DMenuItem *item)
 {
-    if (isDebug())
-	msgDebug("Dists & DIST_XF86 = %d\n", Dists & DIST_XF86);
     return (Dists & DIST_XF86) ? "ON" : "OFF";
 }
 
@@ -382,31 +340,31 @@ very minimum, this should be \"bin\".  WARNING:  Do not export the\n\
 DES distribution out of the U.S.!  It is for U.S. customers only.",
     NULL,
     NULL,
-    { { "bin", "Binary base distribution (required) [36MB]",
-	DMENU_SET_FLAG,	&Dists, DIST_BIN, 0, dmenuFlagCheck	},
-      { "commercial", "Commercial demos and shareware [10MB]",
+    { { "bin",		"Binary base distribution (required) [36MB]",
+	DMENU_SET_FLAG,	&Dists, DIST_BIN, 0, dmenuFlagCheck		},
+      { "commercial",	"Commercial demos and shareware [10MB]",
 	DMENU_SET_FLAG,	&Dists, DIST_COMMERCIAL, 0, dmenuFlagCheck	},
-      { "compat1x", "FreeBSD 1.x binary compatibility package [2MB]",
+      { "compat1x",	"FreeBSD 1.x binary compatibility package [2MB]",
 	DMENU_SET_FLAG,	&Dists, DIST_COMPAT1X, 0, dmenuFlagCheck	},
-      { "compat20", "FreeBSD 2.0 binary compatibility package [2MB]",
+      { "compat20",	"FreeBSD 2.0 binary compatibility package [2MB]",
 	DMENU_SET_FLAG,	&Dists, DIST_COMPAT20, 0, dmenuFlagCheck	},
-      { "DES", "NOT FOR EXPORT! DES encryption code [.3MB]",
+      { "DES",		"DES encryption code - NOT FOR EXPORT! [.3MB]",
 	DMENU_CALL,	distSetDES, 0, 0, DESFlagCheck			},
-      { "dict", "Spelling checker dictionary files [4.2MB]",
+      { "dict",		"Spelling checker dictionary files [4.2MB]",
 	DMENU_SET_FLAG,	&Dists, DIST_DICT, 0, dmenuFlagCheck		},
-      { "games", "Games and other amusements (non-commercial) [6.4MB]",
+      { "games",	"Games (non-commercial) [6.4MB]",
 	DMENU_SET_FLAG,	&Dists, DIST_GAMES, 0, dmenuFlagCheck		},
-      { "info", "GNU info files [4.1MB]",
+      { "info",		"GNU info files [4.1MB]",
 	DMENU_SET_FLAG,	&Dists, DIST_INFO, 0, dmenuFlagCheck		},
-      { "man", "System manual pages - strongly recommended [3.3MB]",
+      { "man",		"System manual pages - recommended [3.3MB]",
 	DMENU_SET_FLAG,	&Dists, DIST_MANPAGES, 0, dmenuFlagCheck	},
-      { "proflibs", "Profiled versions of the libraries [3.3MB]",
+      { "proflibs",	"Profiled versions of the libraries [3.3MB]",
 	DMENU_SET_FLAG,	&Dists, DIST_PROFLIBS, 0, dmenuFlagCheck	},
-      { "src", "Sources for everything but DES [120MB]",
+      { "src",		"Sources for everything but DES [120MB]",
 	DMENU_CALL,	distSetSrc, 0, 0, srcFlagCheck			},
-      { "XFree86", "The XFree86 3.1.1u1 distribution [?]",
+      { "XFree86",	"The XFree86 3.1.1u1 distribution [?]",
 	DMENU_CALL,	distSetXF86, 0, 0, x11FlagCheck			},
-      { "Experimental", "Work in progress!",
+      { "Experimental",	"Work in progress!",
 	DMENU_SET_FLAG,	&Dists, DIST_EXPERIMENTAL, 0, dmenuFlagCheck	},
       { NULL } },
 };
@@ -421,13 +379,13 @@ same reason).  For information on non-U.S. FTP distributions of this\n\
 software, please consult the release notes.",
     NULL,
     NULL,
-    { { "des", "Basic DES services (rlogin, init, etc) [1MB]",
+    { { "des",		"Basic DES services (rlogin, init, etc) [1MB]",
 	DMENU_SET_FLAG, &DESDists, DIST_DES_DES, 0, dmenuFlagCheck	},
-      { "krb", "Kerberos encryption services [2MB]",
+      { "krb",		"Kerberos encryption services [2MB]",
 	DMENU_SET_FLAG, &DESDists, DIST_DES_KERBEROS, 0, dmenuFlagCheck	},
-      { "sebones", "Sources for eBones (Kerberos) [1MB]",
+      { "sebones",	"Sources for eBones (Kerberos) [1MB]",
 	DMENU_SET_FLAG, &DESDists, DIST_DES_SEBONES, 0, dmenuFlagCheck	},
-      { "ssecure", "Sources for DES libs and utilities [1MB]",
+      { "ssecure",	"Sources for DES libs and utilities [1MB]",
 	DMENU_SET_FLAG, &DESDists, DIST_DES_SSECURE, 0, dmenuFlagCheck	},
       { NULL } },
 };
@@ -439,33 +397,35 @@ DMenu MenuSrcDistributions = {
 you wish to install.",
     NULL,
     NULL,
-    { { "base", "top-level files in /usr/src [300K]",
+    { { "base",		"top-level files in /usr/src [300K]",
 	DMENU_SET_FLAG,	&SrcDists, DIST_SRC_BASE, 0, dmenuFlagCheck	},
-      { "gnu", "/usr/src/gnu (software from the GNU Project) [42MB]]",
+      { "gnu",		"/usr/src/gnu (software from the GNU Project) [42MB]",
 	DMENU_SET_FLAG,	&SrcDists, DIST_SRC_GNU, 0, dmenuFlagCheck	},
-      { "etc", "/usr/src/etc (miscellaneous system files) [460K]",
+      { "etc",		"/usr/src/etc (miscellaneous system files) [460K]",
 	DMENU_SET_FLAG,	&SrcDists, DIST_SRC_ETC, 0, dmenuFlagCheck	},
-      { "games", "/usr/src/games (diversions) [7.8MB]",
+      { "games",	"/usr/src/games (diversions) [7.8MB]",
 	DMENU_SET_FLAG,	&SrcDists, DIST_SRC_GAMES, 0, dmenuFlagCheck	},
-      { "include", "/usr/src/include (header files) [467K]",
+      { "include",	"/usr/src/include (header files) [467K]",
 	DMENU_SET_FLAG,	&SrcDists, DIST_SRC_INCLUDE, 0, dmenuFlagCheck	},
-      { "lib", "/usr/src/lib (system libraries) [9.2MB]",
+      { "lib",		"/usr/src/lib (system libraries) [9.2MB]",
 	DMENU_SET_FLAG,	&SrcDists, DIST_SRC_LIB, 0, dmenuFlagCheck	},
-      { "libexec", "/usr/src/libexec (system programs) [1.2MB]",
+      { "libexec",	"/usr/src/libexec (system programs) [1.2MB]",
 	DMENU_SET_FLAG,	&SrcDists, DIST_SRC_LIBEXEC, 0, dmenuFlagCheck	},
-      { "lkm", "/usr/src/lkm (Loadable Kernel Modules) [193K]",
+      { "lkm",		"/usr/src/lkm (Loadable Kernel Modules) [193K]",
 	DMENU_SET_FLAG,	&SrcDists, DIST_SRC_LKM, 0, dmenuFlagCheck	},
-      { "release", "/usr/src/release (release-generation tools) [533K]",
+      { "release",	"/usr/src/release (release-generation tools) [533K]",
 	DMENU_SET_FLAG,	&SrcDists, DIST_SRC_RELEASE, 0, dmenuFlagCheck	},
-      { "sbin", "/usr/src/sbin (system binaries) [1.3MB]",
+      { "bin",		"/usr/src/bin (system binaries) [2.5MB]",
+	DMENU_SET_FLAG,	&SrcDists, DIST_SRC_BIN, 0, dmenuFlagCheck	},
+      { "sbin",		"/usr/src/sbin (system binaries) [1.3MB]",
 	DMENU_SET_FLAG,	&SrcDists, DIST_SRC_SBIN, 0, dmenuFlagCheck	},
-      { "share", "/usr/src/share (documents and shared files) [10MB]",
+      { "share",	"/usr/src/share (documents and shared files) [10MB]",
 	DMENU_SET_FLAG,	&SrcDists, DIST_SRC_SHARE, 0, dmenuFlagCheck	},
-      { "sys", "/usr/src/sys (FreeBSD kernel) [13MB]",
+      { "sys",		"/usr/src/sys (FreeBSD kernel) [13MB]",
 	DMENU_SET_FLAG,	&SrcDists, DIST_SRC_SYS, 0, dmenuFlagCheck	},
-      { "ubin", "/usr/src/usr.bin (user binaries) [13MB]",
+      { "ubin",		"/usr/src/usr.bin (user binaries) [13MB]",
 	DMENU_SET_FLAG,	&SrcDists, DIST_SRC_UBIN, 0, dmenuFlagCheck	},
-      { "usbin", "/usr/src/usr.sbin (aux system binaries) [14MB]",
+      { "usbin",	"/usr/src/usr.sbin (aux system binaries) [14MB]",
 	DMENU_SET_FLAG,	&SrcDists, DIST_SRC_USBIN, 0, dmenuFlagCheck	},
       { NULL } },
 };
@@ -488,16 +448,16 @@ distribution.  We recommend that you select what you need from the basic\n\
 components set and at least one entry from the Server and Font set menus.",
     "Press F1 to read the XFree86 release notes for FreeBSD",
     "XF86.hlp",
-    { { "Basic", "Basic component menu (required)",			/* B */
-	DMENU_SUBMENU, &MenuXF86SelectCore, 0, 0	},
-      { "Server", "X server menu",					/* S */
-	DMENU_SUBMENU, &MenuXF86SelectServer, 0, 0	},
-      { "Fonts", "Font set menu",					/* F */
-	DMENU_SUBMENU, &MenuXF86SelectFonts, 0, 0	},
-      { "Clear", "Reset XFree86 distribution list",
-	DMENU_CALL, clearx11, 0, 0, 0			},
-      { "Exit", "Exit this menu (returning to previous)",		/* E */
-	DMENU_CANCEL, NULL, 0, 0 },
+    { { "Basic",	"Basic component menu (required)",
+	DMENU_SUBMENU,	&MenuXF86SelectCore, 0, 0			},
+      { "Server",	"X server menu",
+	DMENU_SUBMENU,	&MenuXF86SelectServer, 0, 0			},
+      { "Fonts",	"Font set menu",
+	DMENU_SUBMENU,	&MenuXF86SelectFonts, 0, 0			},
+      { "Clear",	"Reset XFree86 distribution list",
+	DMENU_CALL,	clearx11, 0, 0, 0				},
+      { "Exit",		"Exit this menu (returning to previous)",
+	DMENU_CANCEL,	NULL, 0, 0					},
       { NULL } },
 };
 
@@ -507,26 +467,26 @@ DMenu MenuXF86SelectCore = {
     "Please check off the basic XFree86 components you wish to install.",
     "Press F1 to read the XFree86 release notes for FreeBSD",
     "XF86.hlp",
-    { { "bin", "X client applications and shared libs [4MB].",
-	DMENU_SET_FLAG,	&XF86Dists, DIST_XF86_BIN, 0, dmenuFlagCheck	},
-      { "lib", "Data files needed at runtime [600K]",
-	DMENU_SET_FLAG,	&XF86Dists, DIST_XF86_LIB, 0, dmenuFlagCheck	},
-      { "xicf", "Customizable xinit runtime configuration file [100K]",
-	DMENU_SET_FLAG,	&XF86Dists, DIST_XF86_XINIT, 0, dmenuFlagCheck	},
-      { "xdcf", "Customizable xdm runtime configuration file [100K]",
-	DMENU_SET_FLAG,	&XF86Dists, DIST_XF86_XDMCF, 0, dmenuFlagCheck	},
-      { "doc", "READMEs and XFree86 specific man pages [500K]",
-	DMENU_SET_FLAG,	&XF86Dists, DIST_XF86_DOC, 0, dmenuFlagCheck	},
-      { "man", "Man pages (except XFree86 specific ones) [1.2MB]",
-	DMENU_SET_FLAG,	&XF86Dists, DIST_XF86_MAN, 0, dmenuFlagCheck	},
-      { "prog", "Programmer's header and library files [4MB]",
-	DMENU_SET_FLAG,	&XF86Dists, DIST_XF86_PROG, 0, dmenuFlagCheck	},
-      { "link", "X Server reconfiguration kit [7.8MB]",
-	DMENU_SET_FLAG,	&XF86Dists, DIST_XF86_LINK, 0, dmenuFlagCheck	},
-      { "pex", "PEX fonts and libs needed by PEX apps [500K]",
-	DMENU_SET_FLAG,	&XF86Dists, DIST_XF86_PEX, 0, dmenuFlagCheck	},
-      { "sources", "XFree86 3.1.1u1 source + contrib distribution [200MB]",
-	DMENU_SET_FLAG,	&XF86Dists, DIST_XF86_SRC, 0, dmenuFlagCheck	},
+    { { "bin",		"X client applications and shared libs [4MB].",
+	DMENU_SET_FLAG,	&XF86Dists, DIST_XF86_BIN, 0, dmenuFlagCheck		},
+      { "lib",		"Data files needed at runtime [600K]",
+	DMENU_SET_FLAG,	&XF86Dists, DIST_XF86_LIB, 0, dmenuFlagCheck		},
+      { "xicf",		"Customizable xinit runtime configuration file [100K]",
+	DMENU_SET_FLAG,	&XF86Dists, DIST_XF86_XINIT, 0, dmenuFlagCheck		},
+      { "xdcf",		"Customizable xdm runtime configuration file [100K]",
+	DMENU_SET_FLAG,	&XF86Dists, DIST_XF86_XDMCF, 0, dmenuFlagCheck		},
+      { "doc",		"READMEs and XFree86 specific man pages [500K]",
+	DMENU_SET_FLAG,	&XF86Dists, DIST_XF86_DOC, 0, dmenuFlagCheck		},
+      { "man",		"Man pages (except XFree86 specific ones) [1.2MB]",
+	DMENU_SET_FLAG,	&XF86Dists, DIST_XF86_MAN, 0, dmenuFlagCheck		},
+      { "prog",		"Programmer's header and library files [4MB]",
+	DMENU_SET_FLAG,	&XF86Dists, DIST_XF86_PROG, 0, dmenuFlagCheck		},
+      { "link",		"X Server reconfiguration kit [7.8MB]",
+	DMENU_SET_FLAG,	&XF86Dists, DIST_XF86_LINK, 0, dmenuFlagCheck		},
+      { "pex",		"PEX fonts and libs needed by PEX apps [500K]",
+	DMENU_SET_FLAG,	&XF86Dists, DIST_XF86_PEX, 0, dmenuFlagCheck		},
+      { "sources",	"XFree86 3.1.1u1 standard + contrib sources [200MB]",
+	DMENU_SET_FLAG,	&XF86Dists, DIST_XF86_SRC, 0, dmenuFlagCheck		},
       { NULL } },
 };
 
@@ -539,15 +499,15 @@ install.  At the minimum, you should install the standard\n\
 (these are selected by default).",
     "Press F1 to read the XFree86 release notes for FreeBSD",
     "XF86.hlp",
-    { { "fnts", "Standard 75 DPI and miscellaneous fonts [3.6MB]",
+    { { "fnts",		"Standard 75 DPI and miscellaneous fonts [3.6MB]",
 	DMENU_SET_FLAG,	&XF86FontDists, DIST_XF86_FONTS_MISC, 0, dmenuFlagCheck		},
-      { "f100", "100 DPI fonts [1.8MB]",
+      { "f100",		"100 DPI fonts [1.8MB]",
 	DMENU_SET_FLAG,	&XF86FontDists, DIST_XF86_FONTS_100, 0, dmenuFlagCheck		},
-      { "fscl", "Speedo and Type scalable fonts [1.6MB]",
+      { "fscl",		"Speedo and Type scalable fonts [1.6MB]",
 	DMENU_SET_FLAG,	&XF86FontDists, DIST_XF86_FONTS_SCALE, 0, dmenuFlagCheck	},
-      { "non", "Japanese, Chinese and other non-english fonts [3.3MB]",
+      { "non",		"Japanese, Chinese and other non-english fonts [3.3MB]",
 	DMENU_SET_FLAG,	&XF86FontDists, DIST_XF86_FONTS_NON, 0, dmenuFlagCheck		},
-      { "server", "Font server [0.3MB]",
+      { "server",	"Font server [0.3MB]",
 	DMENU_SET_FLAG,	&XF86FontDists, DIST_XF86_FONTS_SERVER, 0, dmenuFlagCheck	},
       { NULL } },
 };
@@ -561,29 +521,29 @@ it is recommended that try the SVGA or VGA16 servers (the VGA16 and\n\
 Mono servers are particularly well-suited to most LCD displays).",
     "Press F1 to read the XFree86 release notes for FreeBSD",
     "XF86.hlp",
-    { { "SVGA", "Standard VGA or Super VGA display [1MB]",
+    { { "SVGA",		"Standard VGA or Super VGA display [1MB]",
 	DMENU_SET_FLAG,	&XF86ServerDists, DIST_XF86_SERVER_SVGA, 0, dmenuFlagCheck	},
-      { "VGA16", "Standard 16 color VGA display [1MB]",
+      { "VGA16",	"Standard 16 color VGA display [1MB]",
 	DMENU_SET_FLAG,	&XF86ServerDists, DIST_XF86_SERVER_VGA16, 0, dmenuFlagCheck	},
-      { "Mono", "Standard Monochrome display [1MB]",
+      { "Mono",		"Standard Monochrome display [1MB]",
 	DMENU_SET_FLAG,	&XF86ServerDists, DIST_XF86_SERVER_MONO, 0, dmenuFlagCheck	},
-      { "8514", "8-bit (256 color) IBM 8514 or compatible card [1MB]",
+      { "8514",		"8-bit (256 color) IBM 8514 or compatible card [1MB]",
 	DMENU_SET_FLAG,	&XF86ServerDists, DIST_XF86_SERVER_8514, 0, dmenuFlagCheck	},
-      { "AGX", "8-bit AGX card [1MB]",
+      { "AGX",		"8-bit AGX card [1MB]",
 	DMENU_SET_FLAG,	&XF86ServerDists, DIST_XF86_SERVER_AGX, 0, dmenuFlagCheck	},
-      { "Ma8", "8-bit ATI Mach8 card [1MB]",
+      { "Ma8",		"8-bit ATI Mach8 card [1MB]",
 	DMENU_SET_FLAG,	&XF86ServerDists, DIST_XF86_SERVER_MACH8, 0, dmenuFlagCheck	},
-      { "Ma32", "8 and 16-bit (65K color) for ATI Mach32 card [1MB]",
+      { "Ma32",		"8 and 16-bit (65K color) for ATI Mach32 card [1MB]",
 	DMENU_SET_FLAG,	&XF86ServerDists, DIST_XF86_SERVER_MACH32, 0, dmenuFlagCheck	},
-      { "Ma64", "8 and 16-bit (65K color) for ATI Mach64 card [1MB]",
+      { "Ma64",		"8 and 16-bit (65K color) for ATI Mach64 card [1MB]",
 	DMENU_SET_FLAG,	&XF86ServerDists, DIST_XF86_SERVER_MACH64, 0, dmenuFlagCheck	},
-      { "P9K", "8, 16, and 24-bit color for Weitek P9000 based boards [1MB]",
+      { "P9K",		"8, 16, and 24-bit color for Weitek P9000 based boards [1MB]",
 	DMENU_SET_FLAG,	&XF86ServerDists, DIST_XF86_SERVER_P9000, 0, dmenuFlagCheck	},
-      { "S3", "8, 16 and 24-bit color for S3 based boards [1MB]",
+      { "S3",		"8, 16 and 24-bit color for S3 based boards [1MB]",
 	DMENU_SET_FLAG,	&XF86ServerDists, DIST_XF86_SERVER_S3, 0, dmenuFlagCheck	},
-      { "W32", "8-bit Color for ET4000/W32, /W32i and /W32p cards [1MB]",
+      { "W32",		"8-bit Color for ET4000/W32, /W32i and /W32p cards [1MB]",
 	DMENU_SET_FLAG,	&XF86ServerDists, DIST_XF86_SERVER_W32, 0, dmenuFlagCheck	},
-      { "nest", "A nested server for testing purposes [1MB]",
+      { "nest",		"A nested server for testing purposes [1MB]",
 	DMENU_SET_FLAG,	&XF86ServerDists, DIST_XF86_SERVER_NEST, 0, dmenuFlagCheck	},
       { NULL } },
 };
@@ -628,10 +588,6 @@ ftpFlagCheck(DMenuItem *item)
 	OptFlags &= ~OPT_FTP_RESELECT;
     if (!(OptFlags & (OPT_FTP_ABORT + OPT_FTP_RESELECT)))
 	OptFlags |= OPT_FTP_ABORT;
-    if ((OptFlags & (OPT_FTP_ACTIVE + OPT_FTP_PASSIVE)) == (OPT_FTP_ACTIVE + OPT_FTP_PASSIVE))
-	OptFlags &= ~OPT_FTP_ACTIVE;
-    if (!(OptFlags & (OPT_FTP_ACTIVE + OPT_FTP_PASSIVE)))
-	OptFlags |= OPT_FTP_PASSIVE;
     if (*((unsigned int *)item->ptr) & item->parm)
         return "ON";
     return "OFF";
@@ -646,58 +602,66 @@ with various possible error conditions and how verbose it will\n\
 be at various stages.",
     "Press F1 for more help on these options",
     "options.hlp",
-    { { "NFS Secure", "NFS server talks only on a secure port",
-	DMENU_SET_FLAG,		&OptFlags, OPT_NFS_SECURE, 0, dmenuFlagCheck	},
-      { "NFS Slow", "User is using a slow PC or ethernet card",
-	DMENU_SET_FLAG,		&OptFlags, OPT_SLOW_ETHER, 0, dmenuFlagCheck		},
-      { "FTP Abort", "On transfer failure, abort",
-	DMENU_SET_FLAG,		&OptFlags, OPT_FTP_ABORT, 0, ftpFlagCheck	},
-      { "FTP Reselect", "On transfer failure, ask for another host",
-	DMENU_SET_FLAG,		&OptFlags, OPT_FTP_RESELECT, 0, ftpFlagCheck	},
-      { "FTP active", "Use \"active mode\" for standard FTP",
-	DMENU_SET_FLAG,		&OptFlags, OPT_FTP_ACTIVE, 0, ftpFlagCheck	},
-      { "FTP passive", "Use \"passive mode\" for firewalled FTP",
-	DMENU_SET_FLAG,		&OptFlags, OPT_FTP_PASSIVE, 0, ftpFlagCheck	},
-      { "Debugging", "Turn on the extra debugging flag",
-	DMENU_SET_FLAG,		&OptFlags, OPT_DEBUG, 0, dmenuFlagCheck	},
-      { "Yes To All", "Assume \"Yes\" answers to all non-critical dialogs",
+    { { "FTP Options",	"Set FTP specific options",
+	DMENU_SUBMENU,	&MenuFTPOptions, 0, 0, 0			},
+      { "NFS Secure",	"NFS server talks only on a secure port",
+	DMENU_SET_FLAG,	&OptFlags, OPT_NFS_SECURE, 0, dmenuFlagCheck	},
+      { "NFS Slow",	"User is using a slow PC or ethernet card",
+	DMENU_SET_FLAG,	&OptFlags, OPT_SLOW_ETHER, 0, dmenuFlagCheck	},
+      { "Debugging",	"Turn on the extra debugging flag",
+	DMENU_SET_FLAG,	&OptFlags, OPT_DEBUG, 0, dmenuFlagCheck		},
+      { "Yes To All",	"Assume \"Yes\" answers to all non-critical dialogs",
 	DMENU_SET_FLAG,	&OptFlags, OPT_NO_CONFIRM, 0, dmenuFlagCheck	},
+      { "Clear",	"Clear All Option Flags",
+	DMENU_CALL,	clearFlags, 0, 0				},
+      { "Exit",		"Exit this menu (returning to previous)",
+	DMENU_CANCEL, NULL, 0, 0					},
+      { NULL } },
+};
+
+DMenu MenuFTPOptions = {
+    DMENU_MULTIPLE_TYPE | DMENU_SELECTION_RETURNS,
+    "Choose FTP Options",
+    "This menu allows you to customize the behavior of FTP transfers\n\
+for an FTP installation.  To select \"Active\" or \"Passive\" mode\n\
+FTP, see the Media menu.",
+    NULL,
+    NULL,
+    { { "FTP Abort",	"On transfer failure, abort",
+	DMENU_SET_FLAG,	&OptFlags, OPT_FTP_ABORT, 0, ftpFlagCheck	},
+      { "FTP Reselect", "On transfer failure, ask for another host",
+	DMENU_SET_FLAG,	&OptFlags, OPT_FTP_RESELECT, 0, ftpFlagCheck	},
       { "FTP userpass", "Specify username and password instead of anonymous",
-	DMENU_CALL, mediaSetFtpUserPass, 0, 0, userPassCheck		},
-      { "Clear", "Clear All Option Flags",
-	DMENU_CALL,		clearFlags, 0, 0 },
-      { "Exit", "Exit this menu (returning to previous)",
-	DMENU_CANCEL, NULL, 0, 0 },
+	DMENU_CALL,	mediaSetFtpUserPass, 0, 0, userPassCheck	},
       { NULL } },
 };
 
 /* The main installation menu */
-DMenu MenuInstall = {
+DMenu MenuInstallCustom = {
     DMENU_NORMAL_TYPE,
-    "Choose Installation Options",		/* title */
-    "Before installation can continue, you need to specify a few\n\
+    "Choose Custom Installation Options",
+    "This is the custom installation menu. You may use this menu to specify\n\
 details on the type of distribution you wish to have, where you wish\n\
-to install it from and how you wish to allocate disk storage to FreeBSD.\n\n\
-None of the items in this menu will actually modify the contents of\n\
-your disk until you select the \"Install\" menu item (and even then, only\n\
-after a final confirmation).",
+to install it from and how you wish to allocate disk storage to FreeBSD.",
     "Press F1 to read the installation guide",
     "install.hlp",
-    { { "Partition", "Allocate disk space for FreeBSD",		/* P */
-	DMENU_CALL,	diskPartitionEditor, 0, 0	},
-      { "Label", "Label allocated disk partitions",		/* L */
-	DMENU_CALL,	diskLabelEditor, 0, 0		},
-      { "Distributions", "Choose the type of installation you want", /* T */
-	DMENU_SUBMENU,	&MenuInstallType, 0, 0		},
-      { "Media", "Choose the installation media type",		/* M */
-	DMENU_SUBMENU,	&MenuMedia, 0, 0		},
-      { "Options", "Go to Options submenu",                        /* O */
-	DMENU_SUBMENU, &MenuOptions, 0, 0		},
-      { "Commit", "Install FreeBSD onto your hard disk(s)",	/* C */
-	DMENU_CALL,	installCommit, 0, 0		},
-      { "Configure", "Do post-install configuration of FreeBSD", /* C */
-	DMENU_SUBMENU,	&MenuConfigure, 0, 0		},
-      { "Exit", "Exit this menu (returning to previous)",
+    { { "Partition",	"Allocate disk space for FreeBSD",
+	DMENU_CALL,	diskPartitionEditor, 0, 0		},
+      { "Label",	"Label allocated disk partitions",
+	DMENU_CALL,	diskLabelEditor, 0, 0			},
+      { "Distributions", "Choose the type of installation you want",
+	DMENU_SUBMENU,	&MenuInstallType, 0, 0			},
+      { "Media",	"Choose the installation media type",
+	DMENU_SUBMENU,	&MenuMedia, 0, 0			},
+      { "Extract",	"Extract distributions from selected media",
+	DMENU_CALL,	distExtractAll, 0, 0			},
+      { "Options",	"Go to Options submenu",
+	DMENU_SUBMENU, &MenuOptions, 0, 0			},
+      { "Commit",	"Do Write/Make/Extract options in one step",
+	DMENU_CALL,	installCommit, 0, 0			},
+      { "Configure",	"Do post-install configuration of FreeBSD",
+	DMENU_SUBMENU,	&MenuConfigure, 0, 0			},
+      { "Exit",		"Exit this menu (returning to previous)",
 	DMENU_CANCEL, NULL, 0, 0 },
       { NULL } },
 };
@@ -716,12 +680,12 @@ one, select \"standard\".  If you would prefer your Master Boot\n\
 Record to remain untouched, then select \"none\".",
     "Press F1 to read the installation guide",
     "install.hlp",
-    { { "BootMgr", "Install the FreeBSD Boot Manager (\"Booteasy\")", /* B */
-	DMENU_SET_VALUE,	&BootMgr, 0, 0, dmenuRadioCheck	},
-      { "Standard", "Use a standard MBR (no boot manager)",	/* S */
+    { { "BootMgr",		"Install the FreeBSD Boot Manager (\"Booteasy\")",
+	DMENU_SET_VALUE,	&BootMgr, 0, 0, dmenuRadioCheck		},
+      { "Standard",		"Use a standard MBR (no boot manager)",
 	DMENU_SET_VALUE,	&BootMgr, 1, 0, dmenuRadioCheck		},
-      { "None", "Leave the Master Boot Record untouched",	/* N */
-	DMENU_SET_VALUE,	&BootMgr, 2, 0, dmenuRadioCheck	},
+      { "None",			"Leave the Master Boot Record untouched",
+	DMENU_SET_VALUE,	&BootMgr, 2, 0, dmenuRadioCheck		},
       { NULL } },
 };
 
@@ -735,24 +699,24 @@ importantly, you can use the Packages utility to load extra \"3rd party\"\n\
 software not provided in the base distributions.",
     "Press F1 for more information on these options",
     "configure.hlp",
-    { { "Add User",	"Add users to the system",
-	DMENU_SYSTEM_COMMAND, "adduser -silent", 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, "rm -f /etc/wall_cmos_clock /etc/localtime; tzsetup", 0, 0			},
-      { "Packages",	"Install extra FreeBSD packaged software",
-	DMENU_CALL,	configPackages, 0, 0			},
-      { "Ports",	"Enable the FreeBSD Ports Collection from CD",
-	DMENU_CALL,	configPorts, 0, 1			},
-      { "Root Password", "Set the system manager's password",
-	DMENU_SYSTEM_COMMAND, "passwd root", 0, 0		},
-      { "XFree86",	"Configure XFree86 (if installed)",
-	DMENU_SYSTEM_COMMAND, "/usr/X11R6/bin/xf86config", 0, 0 },
-      { "Exit", "Exit this menu (returning to previous)",
-	DMENU_CANCEL, NULL, 0, 0 },
+    { { "Add User",		"Add users to the system",
+	DMENU_SYSTEM_COMMAND,	"adduser -silent", 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,	"rm -f /etc/wall_cmos_clock /etc/localtime; tzsetup", 0, 0 },
+      { "Packages",		"Install extra FreeBSD packaged software",
+	DMENU_CALL,		configPackages, 0, 0			},
+      { "Ports",		"Enable the FreeBSD Ports Collection from CD",
+	DMENU_CALL,		configPorts, 0, 1			},
+      { "Root Password",	"Set the system manager's password",
+	DMENU_SYSTEM_COMMAND,	"passwd root", 0, 0			},
+      { "XFree86",		"Configure XFree86 (if installed)",
+	DMENU_SYSTEM_COMMAND,	"/usr/X11R6/bin/xf86config", 0, 0	},
+      { "Exit",			"Exit this menu (returning to previous)",
+	DMENU_CANCEL, NULL, 0, 0					},
       { NULL } },
 };
 
@@ -777,20 +741,20 @@ 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, dmenuVarCheck	},
-      { "NFS server",	"This machine will be an NFS server",
-	DMENU_SET_VARIABLE, "nfs_server=YES", 0, 0, dmenuVarCheck	},
-      { "Interfaces",	"Configure network interfaces",
-	DMENU_CALL,	tcpMenuSelect, 0, 0				},
-      { "ntpdate",	"Select a clock-syncronization server",
-	DMENU_SUBMENU,	&MenuNTP, 0, 0, menuCheckNTP		},
-      { "routed",	"Set flags for routed (default: -q)",
-	DMENU_CALL,	configRoutedFlags, 0, 0, menuCheckRouted	},
-      { "rwhod",	"This machine wants to run the rwho daemon",
-	DMENU_SET_VARIABLE, "rwhod=YES", 0, 0, dmenuVarCheck		},
-      { "Exit", "Exit this menu (returning to previous)",
-	DMENU_CANCEL, NULL, 0, 0 },
+    { { "NFS client",		"This machine will be an NFS client",
+	DMENU_SET_VARIABLE,	"nfs_client=YES", 0, 0, dmenuVarCheck		},
+      { "NFS server",		"This machine will be an NFS server",
+	DMENU_SET_VARIABLE,	"nfs_server=YES", 0, 0, dmenuVarCheck		},
+      { "Interfaces",		"Configure network interfaces",
+	DMENU_CALL,		tcpMenuSelect, 0, 0				},
+      { "ntpdate",		"Select a clock-syncronization server",
+	DMENU_SUBMENU,		&MenuNTP, 0, 0, menuCheckNTP			},
+      { "routed",		"Set flags for routed (default: -q)",
+	DMENU_CALL,		configRoutedFlags, 0, 0, menuCheckRouted	},
+      { "rwhod",		"This machine wants to run the rwho daemon",
+	DMENU_SET_VARIABLE,	"rwhod=YES", 0, 0, dmenuVarCheck		},
+      { "Exit",			"Exit this menu (returning to previous)",
+	DMENU_CANCEL, NULL, 0, 0						},
       { NULL } },
 };
 
@@ -854,14 +818,14 @@ 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		},
-      { "Repeat", "Set the rate at which keys repeat",
-	DMENU_SUBMENU, &MenuSysconsKeyrate, 0, 0	},
-      { "Saver", "Configure the screen saver",
-	DMENU_SUBMENU, &MenuSysconsSaver, 0, 0		},
-      { "Exit", "Exit this menu (returning to previous)",
-	DMENU_CANCEL, NULL, 0, 0 },
+    { { "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",		"Configure the screen saver",
+	DMENU_SUBMENU,		&MenuSysconsSaver, 0, 0		},
+      { "Exit",			"Exit this menu (returning to previous)",
+	DMENU_CANCEL,		NULL, 0, 0			},
       { NULL } },
 };
 
@@ -874,32 +838,32 @@ to a standard \"American\" keyboard map.  Users in other countries\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, dmenuVarCheck	},
-      { "Danish ISO", "Danish ISO keymap",
-	DMENU_SET_VARIABLE, "keymap=danish.iso", 0, 0, dmenuVarCheck	},
-      { "French ISO", "French ISO keymap",
-	DMENU_SET_VARIABLE, "keymap=fr.iso", 0, 0, dmenuVarCheck	},
-      { "German CP850", "German Code Page 850 keymap",
-	DMENU_SET_VARIABLE, "keymap=german.cp850", 0, 0, dmenuVarCheck	},
-      { "German ISO", "German ISO keymap",
-	DMENU_SET_VARIABLE, "keymap=german.iso", 0, 0, dmenuVarCheck	},
-      { "Russian CP866", "Russian Code Page 866 keymap",
-	DMENU_SET_VARIABLE, "keymap=ru.cp866", 0, 0, dmenuVarCheck	},
-      { "Russian KOI8", "Russian koi8 keymap",
-	DMENU_SET_VARIABLE, "keymap=ru.koi8-r", 0, 0, dmenuVarCheck	},
-      { "Russian s-KOI8", "Russian shifted koi8 keymap",
-	DMENU_SET_VARIABLE, "keymap=ru.koi8-r.shift", 0, 0, dmenuVarCheck},
-      { "Swedish CP850", "Swedish Code Page 850 keymap",
-	DMENU_SET_VARIABLE, "keymap=swedish.cp850", 0, 0, dmenuVarCheck	},
-      { "Swedish ISO", "Swedish ISO keymap",
-	DMENU_SET_VARIABLE, "keymap=swedish.iso", 0, 0, dmenuVarCheck	},
-      { "U.K. CP850", "United Kingdom Code Page 850 keymap",
-	DMENU_SET_VARIABLE, "keymap=uk.cp850", 0, 0, dmenuVarCheck	},
-      { "U.K. ISO", "United Kingdom ISO keymap",
-	DMENU_SET_VARIABLE, "keymap=uk.iso", 0, 0, dmenuVarCheck	},
-      { "U.S. ISO", "United States ISO keymap",
-	DMENU_SET_VARIABLE, "keymap=us.iso", 0, 0, dmenuVarCheck	},
+    { { "Danish CP865",		"Danish Code Page 865 keymap",
+	DMENU_SET_VARIABLE,	"keymap=danish.cp865", 0, 0, dmenuVarCheck	},
+      { "Danish ISO",		"Danish ISO keymap",
+	DMENU_SET_VARIABLE,	 "keymap=danish.iso", 0, 0, dmenuVarCheck	},
+      { "French ISO",		"French ISO keymap",
+	DMENU_SET_VARIABLE,	 "keymap=fr.iso", 0, 0, dmenuVarCheck		},
+      { "German CP850",		"German Code Page 850 keymap",
+	DMENU_SET_VARIABLE,	 "keymap=german.cp850", 0, 0, dmenuVarCheck	},
+      { "German ISO",		"German ISO keymap",
+	DMENU_SET_VARIABLE,	 "keymap=german.iso", 0, 0, dmenuVarCheck	},
+      { "Russian CP866",	"Russian Code Page 866 keymap",
+	DMENU_SET_VARIABLE,	 "keymap=ru.cp866", 0, 0, dmenuVarCheck		},
+      { "Russian KOI8",		"Russian koi8 keymap",
+	DMENU_SET_VARIABLE,	 "keymap=ru.koi8-r", 0, 0, dmenuVarCheck	},
+      { "Russian s-KOI8",	"Russian shifted koi8 keymap",
+	DMENU_SET_VARIABLE,	 "keymap=ru.koi8-r.shift", 0, 0, dmenuVarCheck	},
+      { "Swedish CP850",	"Swedish Code Page 850 keymap",
+	DMENU_SET_VARIABLE,	 "keymap=swedish.cp850", 0, 0, dmenuVarCheck	},
+      { "Swedish ISO",		"Swedish ISO keymap",
+	DMENU_SET_VARIABLE,	 "keymap=swedish.iso", 0, 0, dmenuVarCheck	},
+      { "U.K. CP850",		"United Kingdom Code Page 850 keymap",
+	DMENU_SET_VARIABLE,	 "keymap=uk.cp850", 0, 0, dmenuVarCheck		},
+      { "U.K. ISO",		"United Kingdom ISO keymap",
+	DMENU_SET_VARIABLE,	 "keymap=uk.iso", 0, 0, dmenuVarCheck		},
+      { "U.S. ISO",		"United States ISO keymap",
+	DMENU_SET_VARIABLE,	 "keymap=us.iso", 0, 0, dmenuVarCheck		},
       { NULL } },
 };
 
@@ -910,14 +874,14 @@ DMenu MenuSysconsKeyrate = {
 when held down.",
     "Choose a keyboard repeat rate",
     NULL,
-    { { "Slow", "Slow keyboard repeat rate",
-	DMENU_SET_VARIABLE, "keyrate=slow", 0, 0, dmenuVarCheck		},
-      { "Normal", "\"Normal\" keyboard repeat rate",
-	DMENU_SET_VARIABLE, "keyrate=normal", 0, 0, dmenuVarCheck	},
-      { "Fast", "Fast keyboard repeat rate",
-	DMENU_SET_VARIABLE, "keyrate=fast", 0, 0, dmenuVarCheck		},
-      { "Default", "Use default keyboard repeat rate",
-	DMENU_SET_VARIABLE, "keyrate=NO", 0, 0, dmenuVarCheck		},
+    { { "Slow",			"Slow keyboard repeat rate",
+	DMENU_SET_VARIABLE,	"keyrate=slow", 0, 0, dmenuVarCheck		},
+      { "Normal",		"\"Normal\" keyboard repeat rate",
+	DMENU_SET_VARIABLE,	"keyrate=normal", 0, 0, dmenuVarCheck		},
+      { "Fast",			"Fast keyboard repeat rate",
+	DMENU_SET_VARIABLE,	"keyrate=fast", 0, 0, dmenuVarCheck		},
+      { "Default",		"Use default keyboard repeat rate",
+	DMENU_SET_VARIABLE,	"keyrate=NO", 0, 0, dmenuVarCheck		},
       { NULL } },
 };
 
@@ -936,17 +900,17 @@ 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=blank", 0, 0, dmenuVarCheck		},
-      { "Green", "\"Green\" power saving mode (if supported by monitor)",
-	DMENU_SET_VARIABLE, "saver=green", 0, 0, dmenuVarCheck		},
-      { "Snake", "Draw a FreeBSD \"snake\" on your screen",
-	DMENU_SET_VARIABLE, "saver=snake", 0, 0, dmenuVarCheck		},
-      { "Star",	"A \"twinkling stars\" effect",
-	DMENU_SET_VARIABLE, "saver=star", 0, 0, dmenuVarCheck		},
-      { "Timeout", "Set the screen saver timeout interval",
-	DMENU_CALL, configSaverTimeout, 0, 0, menuSaverTimeoutCheck	},
-      { "Exit", "Exit this menu (returning to previous)",
-	DMENU_CANCEL, NULL, 0, 0 },
+    { { "blank",		"Simply blank the screen",
+	DMENU_SET_VARIABLE,	"saver=blank", 0, 0, dmenuVarCheck		},
+      { "Green",		"\"Green\" power saving mode (if supported by monitor)",
+	DMENU_SET_VARIABLE,	"saver=green", 0, 0, dmenuVarCheck		},
+      { "Snake",		"Draw a FreeBSD \"snake\" on your screen",
+	DMENU_SET_VARIABLE,	"saver=snake", 0, 0, dmenuVarCheck		},
+      { "Star",			"A \"twinkling stars\" effect",
+	DMENU_SET_VARIABLE,	"saver=star", 0, 0, dmenuVarCheck		},
+      { "Timeout",		"Set the screen saver timeout interval",
+	DMENU_CALL,		configSaverTimeout, 0, 0, menuSaverTimeoutCheck	},
+      { "Exit",			"Exit this menu (returning to previous)",
+	DMENU_CANCEL,		NULL, 0, 0					},
       { NULL } },
 };