Bump snapshot release date - looks like I was off by a couple

of days!

More display fixes to sysinstall and assorted tweaking.

27 files changed, 256 insertions, 213 deletions

diff --git a/release/Makefile b/release/Makefile
index 9248896..7c7d6e1 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.208 1996/02/27 03:40:40 jkh Exp $
+#	$Id: Makefile,v 1.209 1996/03/19 03:26:33 jkh Exp $
 #
 # How to roll a release:
 #
@@ -11,8 +11,8 @@
 # that on a 14.4 line just yet...
 #
 # SET THIS !!!
-BUILDNAME=2.2-current
-# CHROOTDIR=/a/r1
+BUILDNAME=2.2-960428-SNAP
+CHROOTDIR=/junk/release
 # If this is a RELEASE, then set
 #RELEASETAG=RELENG_2_1_0
 
diff --git a/release/sysinstall/disks.c b/release/sysinstall/disks.c
index 7208cd1..fec4cf2 100644
--- a/release/sysinstall/disks.c
+++ b/release/sysinstall/disks.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: disks.c,v 1.41 1996/04/23 01:29:14 jkh Exp $
+ * $Id: disks.c,v 1.42 1996/04/25 17:31:14 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -400,7 +400,7 @@ diskPartition(Device *dev, Disk *d)
     p = CheckRules(d);
     if (p) {
 	dialog_clear();
-	msgConfirm(p);
+	dialog_mesgbox("Disk partitioning warning:", p, -1, -1);
 	free(p);
     }
     restorescr(w);
diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c
index 5194891..ab42ba8 100644
--- a/release/sysinstall/dist.c
+++ b/release/sysinstall/dist.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: dist.c,v 1.42 1996/04/23 01:29:17 jkh Exp $
+ * $Id: dist.c,v 1.43 1996/04/25 17:31:15 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -478,6 +478,8 @@ distExtractAll(dialogMenuItem *self)
 	msgConfirm("You haven't selected any distributions to extract.");
 	return DITEM_FAILURE;
     }
+    dialog_clear();
+    msgNotify("Attempting to install all selected distributions..");
     /* Try for 3 times around the loop, then give up. */
     while (Dists && ++retries < 3)
 	distExtract(NULL, DistTable);
diff --git a/release/sysinstall/dist.h b/release/sysinstall/dist.h
index fc102dde4..c288c3d 100644
--- a/release/sysinstall/dist.h
+++ b/release/sysinstall/dist.h
@@ -17,7 +17,7 @@
 #define DIST_COMMERCIAL		0x1000
 #define DIST_DES		0x2000
 #define DIST_EXPERIMENTAL	0x4000
-#define DIST_ALL		0x0FFF	/* Don't include commerce, DES or experimental in "all" */
+#define DIST_ALL		0xFFFF
 
 /* Canned distribution sets */
 #define _DIST_DEVELOPER \
@@ -26,6 +26,9 @@
 #define _DIST_USER \
 	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_COMPAT1X | DIST_COMPAT20)
 
+#define _DIST_XDEV \
+	(DIST_XF86_BIN | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS)
+
 /* Subtypes for DES distribution */
 #define DIST_DES_DES		0x0001
 #define DIST_DES_SEBONES	0x0002
diff --git a/release/sysinstall/dmenu.c b/release/sysinstall/dmenu.c
index 7880770..7dbbd15 100644
--- a/release/sysinstall/dmenu.c
+++ b/release/sysinstall/dmenu.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $Id: dmenu.c,v 1.17 1996/04/23 01:29:18 jkh Exp $
+ * $Id: dmenu.c,v 1.18 1996/04/25 17:31:17 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -39,7 +39,7 @@
 
 #define MAX_MENU		15
 
-static Boolean cancelled;
+static Boolean exited;
 
 int
 dmenuDisplayFile(dialogMenuItem *tmp)
@@ -79,9 +79,9 @@ dmenuSystemCommandBox(dialogMenuItem *tmp)
 }
 
 int
-dmenuCancel(dialogMenuItem *tmp)
+dmenuExit(dialogMenuItem *tmp)
 {
-    cancelled = TRUE;
+    exited = TRUE;
     return DITEM_LEAVE_MENU;
 }
 
@@ -200,11 +200,13 @@ dmenuOpen(DMenu *menu, int *choice, int *scroll, int *curr, int *max)
 	else
 	    msgFatal("Menu: `%s' is of an unknown type\n", menu->title);
 	clearok(stdscr, TRUE);
-	if (rval)
-	    return FALSE;
-	else if (cancelled || menu->type & DMENU_SELECTION_RETURNS) {
-	    cancelled = FALSE;
+	if (exited) {
+	    exited = FALSE;
 	    return TRUE;
 	}
+	else if (rval)
+	    return FALSE;
+	else if (menu->type & DMENU_SELECTION_RETURNS)
+	    return TRUE;
     }
 }
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index f1078bf..40e03a0 100644
--- a/release/sysinstall/install.c
+++ b/release/sysinstall/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.85 1996/04/25 17:31:18 jkh Exp $
+ * $Id: install.c,v 1.86 1996/04/25 18:00:28 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -289,7 +289,7 @@ installExpress(dialogMenuItem *self)
 	return DITEM_FAILURE;
 
     if (!Dists) {
-	if (!dmenuOpenSimple(&MenuDistributions))
+	if (!dmenuOpenSimple(&MenuDistributions) && !Dists)
 	    return DITEM_FAILURE | DITEM_RESTORE | DITEM_RECREATE;
     }
 
@@ -337,7 +337,7 @@ installNovice(dialogMenuItem *self)
 	       "X11 developer oriented configurations.  You can also select a custom set\n"
 	       "of distributions if none of the provided ones are suitable.");
     while (1) {
-	if (!dmenuOpenSimple(&MenuDistributions))
+	if (!dmenuOpenSimple(&MenuDistributions) && !Dists)
 	    return DITEM_FAILURE | DITEM_RESTORE | DITEM_RECREATE;
 	
 	if (Dists || !msgYesNo("No distributions selected.  Are you sure you wish to continue?"))
diff --git a/release/sysinstall/media.c b/release/sysinstall/media.c
index 293e7e9..a69e7df 100644
--- a/release/sysinstall/media.c
+++ b/release/sysinstall/media.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: media.c,v 1.34 1996/04/25 17:31:22 jkh Exp $
+ * $Id: media.c,v 1.35 1996/04/26 18:19:34 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -87,7 +87,7 @@ mediaSetCDROM(dialogMenuItem *self)
 		   "configuration is correct and that the CDROM drive is of a supported\n"
 		   "type.  For more information, consult the hardware guide\n"
 		   "in the Doc menu.");
-	return DITEM_FAILURE;
+	return DITEM_FAILURE | DITEM_CONTINUE;
     }
     else if (cnt > 1) {
 	DMenu *menu;
@@ -128,7 +128,7 @@ mediaSetFloppy(dialogMenuItem *self)
 	msgConfirm("No floppy devices found!  Please check that your system's configuration\n"
 		   "is correct.  For more information, consult the hardware guide in the Doc\n"
 		   "menu.");
-	return DITEM_FAILURE;
+	return DITEM_FAILURE | DITEM_CONTINUE;
     }
     else if (cnt > 1) {
 	DMenu *menu;
@@ -167,7 +167,7 @@ mediaSetDOS(dialogMenuItem *self)
     cnt = deviceCount(devs);
     if (!cnt) {
 	msgConfirm("No DOS primary partitions found!  This installation method is unavailable");
-	return DITEM_FAILURE;
+	return DITEM_FAILURE | DITEM_CONTINUE;
     }
     else if (cnt > 1) {
 	DMenu *menu;
@@ -208,7 +208,7 @@ mediaSetTape(dialogMenuItem *self)
 	msgConfirm("No tape drive devices found!  Please check that your system's configuration\n"
 		   "is correct.  For more information, consult the hardware guide in the Doc\n"
 		   "menu.");
-	return DITEM_FAILURE;
+	return DITEM_FAILURE | DITEM_CONTINUE;
     }
     else if (cnt > 1) {
 	DMenu *menu;
diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c
index e7b81ed..d381536 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.53 1996/04/26 18:19:36 jkh Exp $
+ * $Id: menus.c,v 1.54 1996/04/27 07:04:12 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -113,6 +113,22 @@ clearX11Servers(dialogMenuItem *self)
 }
 
 static int
+setX11Fonts(dialogMenuItem *self)
+{
+    XF86Dists |= DIST_XF86_FONTS;
+    XF86FontDists = DIST_XF86_FONTS_ALL;
+    return DITEM_SUCCESS | DITEM_REDRAW;
+}
+
+static int
+clearX11Fonts(dialogMenuItem *self)
+{
+    XF86Dists &= ~DIST_XF86_FONTS;
+    XF86FontDists = 0;
+    return DITEM_SUCCESS | DITEM_REDRAW;
+}
+
+static int
 checkDistDeveloper(dialogMenuItem *self)
 {
     return (Dists == _DIST_DEVELOPER && SrcDists == DIST_SRC_ALL);
@@ -121,10 +137,8 @@ checkDistDeveloper(dialogMenuItem *self)
 static int
 checkDistXDeveloper(dialogMenuItem *self)
 {
-    return (Dists == _DIST_DEVELOPER | DIST_XF86 && SrcDists == DIST_SRC_ALL &&
-	    XF86Dists == DIST_XF86_BIN | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN |
-	    DIST_XF86_SERVER | DIST_XF86_FONTS && (XF86ServerDists & DIST_XF86_SERVER_SVGA) &&
-	    (XF86FontDists & DIST_XF86_FONTS_MISC));
+    return (Dists == (_DIST_DEVELOPER | DIST_XF86) && SrcDists == DIST_SRC_ALL &&
+	    (XF86Dists & _DIST_XDEV) == _DIST_XDEV && XF86ServerDists && XF86FontDists);
 }
 
 static int
@@ -210,7 +224,7 @@ option by pressing [ENTER].",				/* prompt */
   { "7 Fixit",	"Go into repair mode with CDROM or floppy",		NULL, dmenuSubmenu, NULL, &MenuFixit },
   { "8 Upgrade","Upgrade an existing 2.0.5 system",			NULL, installUpgrade },
   { "9 Configure","Do post-install configuration of FreeBSD",		NULL, dmenuSubmenu, NULL, &MenuConfigure },
-  { "0 Exit",	"Exit this menu (and the installation)",		NULL, dmenuCancel },
+  { "0 Exit",	"Exit this menu (and the installation)",		NULL, dmenuExit },
   { NULL } },
 };
 
@@ -249,7 +263,7 @@ consult the README file.",
   { "4 Copyright","The FreeBSD Copyright notices.",			NULL, dmenuDisplayFile,	NULL, "COPYRIGHT" },
   { "5 Release","The release notes for this version of FreeBSD.",	NULL, dmenuDisplayFile, NULL, "relnotes" },
   { "6 HTML Docs","Go to the HTML documentation menu (post-install).",	NULL, docBrowser },
-  { "0 Exit",	"Exit this menu (returning to previous)",		NULL, dmenuCancel },
+  { "0 Exit",	"Exit this menu (returning to previous)",		NULL, dmenuExit },
   { NULL } },
 };
 
@@ -533,8 +547,8 @@ DMenu MenuDistributions = {
 These select what we consider to be the most reasonable defaults for the\n\
 type of system in question.  If you would prefer to pick and choose the\n\
 list of distributions yourself, simply select \"Custom\".  You can also\n\
-pick a canned distribution set and then fine-tune it with the Custom item.\n\
-When you are finished, select Cancel or chose Exit.",
+pick a canned distribution set and then fine-tune it with the Custom item.\n\n\
+When you are finished chose the Exit item or Cancel to abort.",
     "Press F1 for more information on these options.",
     "distributions",
 { { "1 Developer",	"Full sources, binaries and doc but no games [180MB]",
@@ -549,14 +563,14 @@ When you are finished, select Cancel or chose Exit.",
     checkDistXUser, distSetXUser },
   { "6 Minimal",	"The smallest configuration possible [44MB]",
     checkDistMinimum, distSetMinimum },
-  { "7 Custom",		"Specify your own distribution set [?]",
-    checkTrue, dmenuSubmenu, NULL, &MenuSubDistributions, '-', '-', '-' },
-  { "8 All",		"All sources, binaries and XFree86 binaries [700MB]",
+  { "7 All",		"All sources, binaries and XFree86 binaries [700MB]",
     checkDistEverything, distSetEverything },
+  { "8 Custom",		"Specify your own distribution set [?]",
+    NULL, dmenuSubmenu, NULL, &MenuSubDistributions, ' ', ' ', ' ' },
   { "9 Clear",		"Reset selected distribution list to nothing [0MB]",
     NULL, distReset, NULL, NULL, ' ', ' ', ' ' },
   { "0 Exit",		"Exit this menu (returning to previous)",
-    checkTrue, dmenuCancel, NULL, NULL, '<', '<', '<' },
+    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
   { NULL } },
 };
 
@@ -599,11 +613,11 @@ DES distribution out of the U.S.!  It is for U.S. customers only.",
   { "xperimnt",		"Experimental work in progress!",
     dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_EXPERIMENTAL },
   { "All",		"All sources, binaries and XFree86 binaries [700MB]",
-    NULL, distSetEverything	},
+    NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' },
   { "Clear",		"Reset all of the above [0MB]",
     NULL, distReset, NULL, NULL, ' ', ' ', ' ' },
   { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuCancel, NULL, NULL, '<', '<', '<' },
+    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
   { NULL } },
 };
 
@@ -626,7 +640,7 @@ software, please consult the release notes.",
   { "ssecure",	"Sources for DES [1MB]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SSECURE },
   { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuCancel, NULL, NULL, '<', '<', '<' },
+    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
   { NULL } },
 };
 
@@ -670,11 +684,11 @@ you wish to install.",
   { "smailcf",	"/usr/src/usr.sbin (sendmail config macros) [341K]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SMAILCF },
   { "All",	"Select all of the above [120MB]",
-    checkSrc, setSrc },
+    NULL, setSrc, NULL, NULL, ' ', ' ', ' ' },
   { "Clear",	"Reset all of the above [0MB]",
     NULL, clearSrc, NULL, NULL, ' ', ' ', ' ' },
   { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuCancel, NULL, NULL, '<', '<', '<' },
+    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
   { NULL } },
 };
 
@@ -697,7 +711,7 @@ component set and at least one entry from the Server and Font set menus.",
   { "Clear",	"Reset XFree86 distribution list",
     NULL, clearX11All },
   { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuCancel, NULL, NULL, '<', '<', '<' },
+    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
   { NULL } },
 };
 
@@ -739,7 +753,7 @@ Bin, lib, xicf, and xdcf are recommended for a minimum installaion.",
   { "Clear",	"Reset all of the above [0MB]",
     NULL, clearX11Misc, NULL, NULL, ' ', ' ', ' ' },
   { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuCancel, NULL, NULL, '<', '<', '<' },
+    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
   { NULL } },
 };
 
@@ -764,8 +778,12 @@ install.  At the minimum, you should install the standard\n\
     dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_NON },
   { "server",	"Font server [0.3MB]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SERVER },
+  { "All",	"All fonts [10MB]",
+    NULL, setX11Fonts, NULL, NULL, ' ', ' ', ' ' },
+  { "Clear",	"Reset font selections [0MB]",
+    NULL, clearX11Fonts, NULL, NULL, ' ', ' ', ' ' },
   { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuCancel, NULL, NULL, '<', '<', '<' },
+    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
   { NULL } },
 };
 
@@ -807,7 +825,7 @@ Mono servers are particularly well-suited to most LCD displays).",
   { "Clear",	"Reset all of the above [0MB]",
     NULL, clearX11Servers, NULL, NULL, ' ', ' ', ' ' },
   { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuCancel, NULL, NULL, '<', '<', '<' },
+    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
   { NULL } },
 };
 
@@ -857,7 +875,7 @@ to install it from and how you wish to allocate disk storage to FreeBSD.",
   { "5 Media",		"Choose the installation media type",	NULL, dmenuSubmenu, NULL, &MenuMedia },
   { "6 Commit",		"Perform any pending Partition/Label/Extract actions", NULL, installCommit },
   { "7 Extract",	"Just do distribution extract step",	NULL, distExtractAll },
-  { "0 Exit",		"Exit this menu (returning to previous)", NULL, dmenuCancel },
+  { "0 Exit",		"Exit this menu (returning to previous)", NULL, dmenuExit },
   { NULL } },
 };
 
@@ -920,7 +938,7 @@ software not provided in the base distributions.",
   { "C XFree86",	"Configure XFree86",
     NULL, configXFree86 },
   { "0 Exit",		"Exit this menu (returning to previous)",
-    NULL, dmenuCancel },
+    NULL, dmenuExit },
   { NULL } },
 };
 
@@ -958,7 +976,7 @@ aspects of your system's network configuration.",
   { "PCNFSD",		"Run authentication server for clients with PC-NFS.",
     NULL, configPCNFSD },
   { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuCancel, NULL, NULL, '<', '<', '<' },
+    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
   { NULL } },
 };
 
@@ -1025,7 +1043,7 @@ When you are done setting configuration options, select Cancel.",
 { { "Keymap",	"Choose an alternate keyboard map",	NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap },
   { "Repeat",	"Set the rate at which keys repeat",	NULL, dmenuSubmenu, NULL, &MenuSysconsKeyrate },
   { "Saver",	"Configure the screen saver",		NULL, dmenuSubmenu, NULL, &MenuSysconsSaver },
-  { "Exit",	"Exit this menu (returning to previous)", NULL, dmenuCancel },
+  { "Exit",	"Exit this menu (returning to previous)", NULL, dmenuExit },
   { NULL } },
 };
 
diff --git a/release/sysinstall/msg.c b/release/sysinstall/msg.c
index a569169..b148c1a 100644
--- a/release/sysinstall/msg.c
+++ b/release/sysinstall/msg.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: msg.c,v 1.30 1995/12/07 10:34:09 peter Exp $
+ * $Id: msg.c,v 1.31 1996/04/13 13:32:02 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -58,7 +58,7 @@ msgYap(char *fmt, ...)
     char *errstr;
     int attrs;
 
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     va_start(args, fmt);
     vsnprintf(errstr, FILENAME_MAX, fmt, args);
     va_end(args);
@@ -67,7 +67,6 @@ msgYap(char *fmt, ...)
     mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, errstr);
     attrset(attrs);
     refresh();
-    free(errstr);
 }
 
 /* Whack up an informational message on the status line */
@@ -88,7 +87,7 @@ msgInfo(char *fmt, ...)
 	attrset(attrs);
 	return;
     }
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     va_start(args, fmt);
     vsnprintf(errstr, FILENAME_MAX, fmt, args);
     va_end(args);
@@ -110,7 +109,6 @@ msgInfo(char *fmt, ...)
 	    msgDebug("Information: `%s'\n", errstr);
 	msgInfo(NULL);
     }
-    free(errstr);
 }
 
 /* Whack up a warning on the status line */
@@ -121,7 +119,7 @@ msgWarn(char *fmt, ...)
     char *errstr;
     int attrs;
 
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     strcpy(errstr, "Warning: ");
     va_start(args, fmt);
     vsnprintf((char *)(errstr + strlen(errstr)), FILENAME_MAX, fmt, args);
@@ -134,7 +132,6 @@ msgWarn(char *fmt, ...)
     refresh();
     if (OnVTY && isDebug())
 	msgDebug("Warning message `%s'\n", errstr);
-    free(errstr);
 }
 
 /* Whack up an error on the status line */
@@ -145,7 +142,7 @@ msgError(char *fmt, ...)
     char *errstr;
     int attrs;
 
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     strcpy(errstr, "Error: ");
     va_start(args, fmt);
     vsnprintf((char *)(errstr + strlen(errstr)), FILENAME_MAX, fmt, args);
@@ -158,7 +155,6 @@ msgError(char *fmt, ...)
     refresh();
     if (OnVTY && isDebug())
 	msgDebug("Error message `%s'\n", errstr);
-    free(errstr);
 }
 
 /* Whack up a fatal error on the status line */
@@ -169,7 +165,7 @@ msgFatal(char *fmt, ...)
     char *errstr;
     int attrs;
 
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     strcpy(errstr, "Fatal Error: ");
     va_start(args, fmt);
     vsnprintf((char *)(errstr + strlen(errstr)), FILENAME_MAX, fmt, args);
@@ -188,7 +184,6 @@ msgFatal(char *fmt, ...)
     refresh();
     if (OnVTY)
 	msgDebug("Fatal error `%s'!\n", errstr);
-    free(errstr);
     getch();
     systemShutdown();
 }
@@ -201,7 +196,7 @@ msgConfirm(char *fmt, ...)
     char *errstr;
     WINDOW *w;
 
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     va_start(args, fmt);
     vsnprintf(errstr, FILENAME_MAX, fmt, args);
     va_end(args);
@@ -215,7 +210,6 @@ msgConfirm(char *fmt, ...)
     }
     dialog_notify(errstr);
     restorescr(w);
-    free(errstr);
 }
 
 /* Put up a message in a popup information box */
@@ -225,7 +219,7 @@ msgNotify(char *fmt, ...)
     va_list args;
     char *errstr;
 
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     va_start(args, fmt);
     vsnprintf(errstr, FILENAME_MAX, fmt, args);
     va_end(args);
@@ -235,7 +229,6 @@ msgNotify(char *fmt, ...)
 	msgDebug("Notify: %s\n", errstr);
     dialog_clear();
     dialog_msgbox("Information Dialog", errstr, -1, -1, 0);
-    free(errstr);
 }
 
 /* Put up a message in a popup yes/no box and return 1 for YES, 0 for NO */
@@ -247,7 +240,7 @@ msgYesNo(char *fmt, ...)
     int ret;
     WINDOW *w;
 
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     va_start(args, fmt);
     vsnprintf(errstr, FILENAME_MAX, fmt, args);
     va_end(args);
@@ -261,7 +254,6 @@ msgYesNo(char *fmt, ...)
     }
     ret = dialog_yesno("User Confirmation Requested", errstr, -1, -1);
     restorescr(w);
-    free(errstr);
     return ret;
 }
 
@@ -275,7 +267,7 @@ msgGetInput(char *buf, char *fmt, ...)
     int rval;
     WINDOW *w;
 
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     va_start(args, fmt);
     vsnprintf(errstr, FILENAME_MAX, fmt, args);
     va_end(args);
@@ -293,7 +285,6 @@ msgGetInput(char *buf, char *fmt, ...)
     }
     rval = dialog_inputbox("Value Required", errstr, -1, -1, input_buffer);
     restorescr(w);
-    free(errstr);
     if (!rval)
 	return input_buffer;
     else
@@ -309,13 +300,12 @@ msgDebug(char *fmt, ...)
 
     if (DebugFD == -1)
 	return;
-    dbg = (char *)safe_malloc(FILENAME_MAX);
+    dbg = (char *)alloca(FILENAME_MAX);
     strcpy(dbg, "DEBUG: ");
     va_start(args, fmt);
     vsnprintf((char *)(dbg + strlen(dbg)), FILENAME_MAX, fmt, args);
     va_end(args);
     write(DebugFD, dbg, strlen(dbg));
-    free(dbg);
 }
 
 /* Tell the user there's some output to go look at */
@@ -325,7 +315,7 @@ msgWeHaveOutput(char *fmt, ...)
     va_list args;
     char *errstr;
 
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     va_start(args, fmt);
     vsnprintf(errstr, FILENAME_MAX, fmt, args);
     va_end(args);
@@ -334,7 +324,6 @@ msgWeHaveOutput(char *fmt, ...)
     msgDebug("Notify: %s\n", errstr);
     dialog_clear();
     dialog_msgbox("Information Dialog", errstr, -1, -1, 0);
-    free(errstr);
     if (OnVTY)
 	msgInfo("Command output is on VTY2 - type ALT-F2 to see it");
 }
diff --git a/release/sysinstall/sysinstall.h b/release/sysinstall/sysinstall.h
index bdf8068..86d7bed 100644
--- a/release/sysinstall/sysinstall.h
+++ b/release/sysinstall/sysinstall.h
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: sysinstall.h,v 1.51 1996/04/23 01:29:32 jkh Exp $
+ * $Id: sysinstall.h,v 1.52 1996/04/25 17:31:26 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -400,7 +400,7 @@ extern int	dmenuDisplayFile(dialogMenuItem *tmp);
 extern int	dmenuSubmenu(dialogMenuItem *tmp);
 extern int	dmenuSystemCommand(dialogMenuItem *tmp);
 extern int	dmenuSystemCommandBox(dialogMenuItem *tmp);
-extern int	dmenuCancel(dialogMenuItem *tmp);
+extern int	dmenuExit(dialogMenuItem *tmp);
 extern int	dmenuSetVariable(dialogMenuItem *tmp);
 extern int	dmenuSetFlag(dialogMenuItem *tmp);
 extern int	dmenuSetValue(dialogMenuItem *tmp);
diff --git a/release/sysinstall/tcpip.c b/release/sysinstall/tcpip.c
index fbde09a..1423ac4 100644
--- a/release/sysinstall/tcpip.c
+++ b/release/sysinstall/tcpip.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tcpip.c,v 1.35 1996/04/13 13:32:12 jkh Exp $
+ * $Id: tcpip.c,v 1.36 1996/04/23 01:29:35 jkh Exp $
  *
  * Copyright (c) 1995
  *      Gary J Palmer. All rights reserved.
@@ -545,6 +545,9 @@ tcpDeviceSelect(void)
 	/* If we're running in user mode, assume network already up */
 	if (RunningAsInit)
 	    tcpOpenDialog(devs[0]);
+	else
+	    msgConfirm("Since you're running multi-user, we'll assume\n"
+		       "that the network is already up.");
 	mediaDevice = devs[0];
 	status = TRUE;
     }
@@ -564,5 +567,5 @@ tcpMenuSelect(dialogMenuItem *self)
 {
     (void)tcpDeviceSelect();
     configResolv();
-    return DITEM_SUCCESS;
+    return DITEM_SUCCESS | DITEM_RECREATE | DITEM_RESTORE;
 }
diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c
index 7208cd1..fec4cf2 100644
--- a/usr.sbin/sade/disks.c
+++ b/usr.sbin/sade/disks.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: disks.c,v 1.41 1996/04/23 01:29:14 jkh Exp $
+ * $Id: disks.c,v 1.42 1996/04/25 17:31:14 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -400,7 +400,7 @@ diskPartition(Device *dev, Disk *d)
     p = CheckRules(d);
     if (p) {
 	dialog_clear();
-	msgConfirm(p);
+	dialog_mesgbox("Disk partitioning warning:", p, -1, -1);
 	free(p);
     }
     restorescr(w);
diff --git a/usr.sbin/sade/dmenu.c b/usr.sbin/sade/dmenu.c
index 7880770..7dbbd15 100644
--- a/usr.sbin/sade/dmenu.c
+++ b/usr.sbin/sade/dmenu.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $Id: dmenu.c,v 1.17 1996/04/23 01:29:18 jkh Exp $
+ * $Id: dmenu.c,v 1.18 1996/04/25 17:31:17 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -39,7 +39,7 @@
 
 #define MAX_MENU		15
 
-static Boolean cancelled;
+static Boolean exited;
 
 int
 dmenuDisplayFile(dialogMenuItem *tmp)
@@ -79,9 +79,9 @@ dmenuSystemCommandBox(dialogMenuItem *tmp)
 }
 
 int
-dmenuCancel(dialogMenuItem *tmp)
+dmenuExit(dialogMenuItem *tmp)
 {
-    cancelled = TRUE;
+    exited = TRUE;
     return DITEM_LEAVE_MENU;
 }
 
@@ -200,11 +200,13 @@ dmenuOpen(DMenu *menu, int *choice, int *scroll, int *curr, int *max)
 	else
 	    msgFatal("Menu: `%s' is of an unknown type\n", menu->title);
 	clearok(stdscr, TRUE);
-	if (rval)
-	    return FALSE;
-	else if (cancelled || menu->type & DMENU_SELECTION_RETURNS) {
-	    cancelled = FALSE;
+	if (exited) {
+	    exited = FALSE;
 	    return TRUE;
 	}
+	else if (rval)
+	    return FALSE;
+	else if (menu->type & DMENU_SELECTION_RETURNS)
+	    return TRUE;
     }
 }
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index f1078bf..40e03a0 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.85 1996/04/25 17:31:18 jkh Exp $
+ * $Id: install.c,v 1.86 1996/04/25 18:00:28 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -289,7 +289,7 @@ installExpress(dialogMenuItem *self)
 	return DITEM_FAILURE;
 
     if (!Dists) {
-	if (!dmenuOpenSimple(&MenuDistributions))
+	if (!dmenuOpenSimple(&MenuDistributions) && !Dists)
 	    return DITEM_FAILURE | DITEM_RESTORE | DITEM_RECREATE;
     }
 
@@ -337,7 +337,7 @@ installNovice(dialogMenuItem *self)
 	       "X11 developer oriented configurations.  You can also select a custom set\n"
 	       "of distributions if none of the provided ones are suitable.");
     while (1) {
-	if (!dmenuOpenSimple(&MenuDistributions))
+	if (!dmenuOpenSimple(&MenuDistributions) && !Dists)
 	    return DITEM_FAILURE | DITEM_RESTORE | DITEM_RECREATE;
 	
 	if (Dists || !msgYesNo("No distributions selected.  Are you sure you wish to continue?"))
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index e7b81ed..d381536 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/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.53 1996/04/26 18:19:36 jkh Exp $
+ * $Id: menus.c,v 1.54 1996/04/27 07:04:12 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -113,6 +113,22 @@ clearX11Servers(dialogMenuItem *self)
 }
 
 static int
+setX11Fonts(dialogMenuItem *self)
+{
+    XF86Dists |= DIST_XF86_FONTS;
+    XF86FontDists = DIST_XF86_FONTS_ALL;
+    return DITEM_SUCCESS | DITEM_REDRAW;
+}
+
+static int
+clearX11Fonts(dialogMenuItem *self)
+{
+    XF86Dists &= ~DIST_XF86_FONTS;
+    XF86FontDists = 0;
+    return DITEM_SUCCESS | DITEM_REDRAW;
+}
+
+static int
 checkDistDeveloper(dialogMenuItem *self)
 {
     return (Dists == _DIST_DEVELOPER && SrcDists == DIST_SRC_ALL);
@@ -121,10 +137,8 @@ checkDistDeveloper(dialogMenuItem *self)
 static int
 checkDistXDeveloper(dialogMenuItem *self)
 {
-    return (Dists == _DIST_DEVELOPER | DIST_XF86 && SrcDists == DIST_SRC_ALL &&
-	    XF86Dists == DIST_XF86_BIN | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN |
-	    DIST_XF86_SERVER | DIST_XF86_FONTS && (XF86ServerDists & DIST_XF86_SERVER_SVGA) &&
-	    (XF86FontDists & DIST_XF86_FONTS_MISC));
+    return (Dists == (_DIST_DEVELOPER | DIST_XF86) && SrcDists == DIST_SRC_ALL &&
+	    (XF86Dists & _DIST_XDEV) == _DIST_XDEV && XF86ServerDists && XF86FontDists);
 }
 
 static int
@@ -210,7 +224,7 @@ option by pressing [ENTER].",				/* prompt */
   { "7 Fixit",	"Go into repair mode with CDROM or floppy",		NULL, dmenuSubmenu, NULL, &MenuFixit },
   { "8 Upgrade","Upgrade an existing 2.0.5 system",			NULL, installUpgrade },
   { "9 Configure","Do post-install configuration of FreeBSD",		NULL, dmenuSubmenu, NULL, &MenuConfigure },
-  { "0 Exit",	"Exit this menu (and the installation)",		NULL, dmenuCancel },
+  { "0 Exit",	"Exit this menu (and the installation)",		NULL, dmenuExit },
   { NULL } },
 };
 
@@ -249,7 +263,7 @@ consult the README file.",
   { "4 Copyright","The FreeBSD Copyright notices.",			NULL, dmenuDisplayFile,	NULL, "COPYRIGHT" },
   { "5 Release","The release notes for this version of FreeBSD.",	NULL, dmenuDisplayFile, NULL, "relnotes" },
   { "6 HTML Docs","Go to the HTML documentation menu (post-install).",	NULL, docBrowser },
-  { "0 Exit",	"Exit this menu (returning to previous)",		NULL, dmenuCancel },
+  { "0 Exit",	"Exit this menu (returning to previous)",		NULL, dmenuExit },
   { NULL } },
 };
 
@@ -533,8 +547,8 @@ DMenu MenuDistributions = {
 These select what we consider to be the most reasonable defaults for the\n\
 type of system in question.  If you would prefer to pick and choose the\n\
 list of distributions yourself, simply select \"Custom\".  You can also\n\
-pick a canned distribution set and then fine-tune it with the Custom item.\n\
-When you are finished, select Cancel or chose Exit.",
+pick a canned distribution set and then fine-tune it with the Custom item.\n\n\
+When you are finished chose the Exit item or Cancel to abort.",
     "Press F1 for more information on these options.",
     "distributions",
 { { "1 Developer",	"Full sources, binaries and doc but no games [180MB]",
@@ -549,14 +563,14 @@ When you are finished, select Cancel or chose Exit.",
     checkDistXUser, distSetXUser },
   { "6 Minimal",	"The smallest configuration possible [44MB]",
     checkDistMinimum, distSetMinimum },
-  { "7 Custom",		"Specify your own distribution set [?]",
-    checkTrue, dmenuSubmenu, NULL, &MenuSubDistributions, '-', '-', '-' },
-  { "8 All",		"All sources, binaries and XFree86 binaries [700MB]",
+  { "7 All",		"All sources, binaries and XFree86 binaries [700MB]",
     checkDistEverything, distSetEverything },
+  { "8 Custom",		"Specify your own distribution set [?]",
+    NULL, dmenuSubmenu, NULL, &MenuSubDistributions, ' ', ' ', ' ' },
   { "9 Clear",		"Reset selected distribution list to nothing [0MB]",
     NULL, distReset, NULL, NULL, ' ', ' ', ' ' },
   { "0 Exit",		"Exit this menu (returning to previous)",
-    checkTrue, dmenuCancel, NULL, NULL, '<', '<', '<' },
+    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
   { NULL } },
 };
 
@@ -599,11 +613,11 @@ DES distribution out of the U.S.!  It is for U.S. customers only.",
   { "xperimnt",		"Experimental work in progress!",
     dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_EXPERIMENTAL },
   { "All",		"All sources, binaries and XFree86 binaries [700MB]",
-    NULL, distSetEverything	},
+    NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' },
   { "Clear",		"Reset all of the above [0MB]",
     NULL, distReset, NULL, NULL, ' ', ' ', ' ' },
   { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuCancel, NULL, NULL, '<', '<', '<' },
+    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
   { NULL } },
 };
 
@@ -626,7 +640,7 @@ software, please consult the release notes.",
   { "ssecure",	"Sources for DES [1MB]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SSECURE },
   { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuCancel, NULL, NULL, '<', '<', '<' },
+    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
   { NULL } },
 };
 
@@ -670,11 +684,11 @@ you wish to install.",
   { "smailcf",	"/usr/src/usr.sbin (sendmail config macros) [341K]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SMAILCF },
   { "All",	"Select all of the above [120MB]",
-    checkSrc, setSrc },
+    NULL, setSrc, NULL, NULL, ' ', ' ', ' ' },
   { "Clear",	"Reset all of the above [0MB]",
     NULL, clearSrc, NULL, NULL, ' ', ' ', ' ' },
   { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuCancel, NULL, NULL, '<', '<', '<' },
+    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
   { NULL } },
 };
 
@@ -697,7 +711,7 @@ component set and at least one entry from the Server and Font set menus.",
   { "Clear",	"Reset XFree86 distribution list",
     NULL, clearX11All },
   { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuCancel, NULL, NULL, '<', '<', '<' },
+    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
   { NULL } },
 };
 
@@ -739,7 +753,7 @@ Bin, lib, xicf, and xdcf are recommended for a minimum installaion.",
   { "Clear",	"Reset all of the above [0MB]",
     NULL, clearX11Misc, NULL, NULL, ' ', ' ', ' ' },
   { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuCancel, NULL, NULL, '<', '<', '<' },
+    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
   { NULL } },
 };
 
@@ -764,8 +778,12 @@ install.  At the minimum, you should install the standard\n\
     dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_NON },
   { "server",	"Font server [0.3MB]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SERVER },
+  { "All",	"All fonts [10MB]",
+    NULL, setX11Fonts, NULL, NULL, ' ', ' ', ' ' },
+  { "Clear",	"Reset font selections [0MB]",
+    NULL, clearX11Fonts, NULL, NULL, ' ', ' ', ' ' },
   { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuCancel, NULL, NULL, '<', '<', '<' },
+    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
   { NULL } },
 };
 
@@ -807,7 +825,7 @@ Mono servers are particularly well-suited to most LCD displays).",
   { "Clear",	"Reset all of the above [0MB]",
     NULL, clearX11Servers, NULL, NULL, ' ', ' ', ' ' },
   { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuCancel, NULL, NULL, '<', '<', '<' },
+    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
   { NULL } },
 };
 
@@ -857,7 +875,7 @@ to install it from and how you wish to allocate disk storage to FreeBSD.",
   { "5 Media",		"Choose the installation media type",	NULL, dmenuSubmenu, NULL, &MenuMedia },
   { "6 Commit",		"Perform any pending Partition/Label/Extract actions", NULL, installCommit },
   { "7 Extract",	"Just do distribution extract step",	NULL, distExtractAll },
-  { "0 Exit",		"Exit this menu (returning to previous)", NULL, dmenuCancel },
+  { "0 Exit",		"Exit this menu (returning to previous)", NULL, dmenuExit },
   { NULL } },
 };
 
@@ -920,7 +938,7 @@ software not provided in the base distributions.",
   { "C XFree86",	"Configure XFree86",
     NULL, configXFree86 },
   { "0 Exit",		"Exit this menu (returning to previous)",
-    NULL, dmenuCancel },
+    NULL, dmenuExit },
   { NULL } },
 };
 
@@ -958,7 +976,7 @@ aspects of your system's network configuration.",
   { "PCNFSD",		"Run authentication server for clients with PC-NFS.",
     NULL, configPCNFSD },
   { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuCancel, NULL, NULL, '<', '<', '<' },
+    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
   { NULL } },
 };
 
@@ -1025,7 +1043,7 @@ When you are done setting configuration options, select Cancel.",
 { { "Keymap",	"Choose an alternate keyboard map",	NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap },
   { "Repeat",	"Set the rate at which keys repeat",	NULL, dmenuSubmenu, NULL, &MenuSysconsKeyrate },
   { "Saver",	"Configure the screen saver",		NULL, dmenuSubmenu, NULL, &MenuSysconsSaver },
-  { "Exit",	"Exit this menu (returning to previous)", NULL, dmenuCancel },
+  { "Exit",	"Exit this menu (returning to previous)", NULL, dmenuExit },
   { NULL } },
 };
 
diff --git a/usr.sbin/sade/msg.c b/usr.sbin/sade/msg.c
index a569169..b148c1a 100644
--- a/usr.sbin/sade/msg.c
+++ b/usr.sbin/sade/msg.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: msg.c,v 1.30 1995/12/07 10:34:09 peter Exp $
+ * $Id: msg.c,v 1.31 1996/04/13 13:32:02 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -58,7 +58,7 @@ msgYap(char *fmt, ...)
     char *errstr;
     int attrs;
 
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     va_start(args, fmt);
     vsnprintf(errstr, FILENAME_MAX, fmt, args);
     va_end(args);
@@ -67,7 +67,6 @@ msgYap(char *fmt, ...)
     mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, errstr);
     attrset(attrs);
     refresh();
-    free(errstr);
 }
 
 /* Whack up an informational message on the status line */
@@ -88,7 +87,7 @@ msgInfo(char *fmt, ...)
 	attrset(attrs);
 	return;
     }
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     va_start(args, fmt);
     vsnprintf(errstr, FILENAME_MAX, fmt, args);
     va_end(args);
@@ -110,7 +109,6 @@ msgInfo(char *fmt, ...)
 	    msgDebug("Information: `%s'\n", errstr);
 	msgInfo(NULL);
     }
-    free(errstr);
 }
 
 /* Whack up a warning on the status line */
@@ -121,7 +119,7 @@ msgWarn(char *fmt, ...)
     char *errstr;
     int attrs;
 
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     strcpy(errstr, "Warning: ");
     va_start(args, fmt);
     vsnprintf((char *)(errstr + strlen(errstr)), FILENAME_MAX, fmt, args);
@@ -134,7 +132,6 @@ msgWarn(char *fmt, ...)
     refresh();
     if (OnVTY && isDebug())
 	msgDebug("Warning message `%s'\n", errstr);
-    free(errstr);
 }
 
 /* Whack up an error on the status line */
@@ -145,7 +142,7 @@ msgError(char *fmt, ...)
     char *errstr;
     int attrs;
 
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     strcpy(errstr, "Error: ");
     va_start(args, fmt);
     vsnprintf((char *)(errstr + strlen(errstr)), FILENAME_MAX, fmt, args);
@@ -158,7 +155,6 @@ msgError(char *fmt, ...)
     refresh();
     if (OnVTY && isDebug())
 	msgDebug("Error message `%s'\n", errstr);
-    free(errstr);
 }
 
 /* Whack up a fatal error on the status line */
@@ -169,7 +165,7 @@ msgFatal(char *fmt, ...)
     char *errstr;
     int attrs;
 
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     strcpy(errstr, "Fatal Error: ");
     va_start(args, fmt);
     vsnprintf((char *)(errstr + strlen(errstr)), FILENAME_MAX, fmt, args);
@@ -188,7 +184,6 @@ msgFatal(char *fmt, ...)
     refresh();
     if (OnVTY)
 	msgDebug("Fatal error `%s'!\n", errstr);
-    free(errstr);
     getch();
     systemShutdown();
 }
@@ -201,7 +196,7 @@ msgConfirm(char *fmt, ...)
     char *errstr;
     WINDOW *w;
 
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     va_start(args, fmt);
     vsnprintf(errstr, FILENAME_MAX, fmt, args);
     va_end(args);
@@ -215,7 +210,6 @@ msgConfirm(char *fmt, ...)
     }
     dialog_notify(errstr);
     restorescr(w);
-    free(errstr);
 }
 
 /* Put up a message in a popup information box */
@@ -225,7 +219,7 @@ msgNotify(char *fmt, ...)
     va_list args;
     char *errstr;
 
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     va_start(args, fmt);
     vsnprintf(errstr, FILENAME_MAX, fmt, args);
     va_end(args);
@@ -235,7 +229,6 @@ msgNotify(char *fmt, ...)
 	msgDebug("Notify: %s\n", errstr);
     dialog_clear();
     dialog_msgbox("Information Dialog", errstr, -1, -1, 0);
-    free(errstr);
 }
 
 /* Put up a message in a popup yes/no box and return 1 for YES, 0 for NO */
@@ -247,7 +240,7 @@ msgYesNo(char *fmt, ...)
     int ret;
     WINDOW *w;
 
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     va_start(args, fmt);
     vsnprintf(errstr, FILENAME_MAX, fmt, args);
     va_end(args);
@@ -261,7 +254,6 @@ msgYesNo(char *fmt, ...)
     }
     ret = dialog_yesno("User Confirmation Requested", errstr, -1, -1);
     restorescr(w);
-    free(errstr);
     return ret;
 }
 
@@ -275,7 +267,7 @@ msgGetInput(char *buf, char *fmt, ...)
     int rval;
     WINDOW *w;
 
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     va_start(args, fmt);
     vsnprintf(errstr, FILENAME_MAX, fmt, args);
     va_end(args);
@@ -293,7 +285,6 @@ msgGetInput(char *buf, char *fmt, ...)
     }
     rval = dialog_inputbox("Value Required", errstr, -1, -1, input_buffer);
     restorescr(w);
-    free(errstr);
     if (!rval)
 	return input_buffer;
     else
@@ -309,13 +300,12 @@ msgDebug(char *fmt, ...)
 
     if (DebugFD == -1)
 	return;
-    dbg = (char *)safe_malloc(FILENAME_MAX);
+    dbg = (char *)alloca(FILENAME_MAX);
     strcpy(dbg, "DEBUG: ");
     va_start(args, fmt);
     vsnprintf((char *)(dbg + strlen(dbg)), FILENAME_MAX, fmt, args);
     va_end(args);
     write(DebugFD, dbg, strlen(dbg));
-    free(dbg);
 }
 
 /* Tell the user there's some output to go look at */
@@ -325,7 +315,7 @@ msgWeHaveOutput(char *fmt, ...)
     va_list args;
     char *errstr;
 
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     va_start(args, fmt);
     vsnprintf(errstr, FILENAME_MAX, fmt, args);
     va_end(args);
@@ -334,7 +324,6 @@ msgWeHaveOutput(char *fmt, ...)
     msgDebug("Notify: %s\n", errstr);
     dialog_clear();
     dialog_msgbox("Information Dialog", errstr, -1, -1, 0);
-    free(errstr);
     if (OnVTY)
 	msgInfo("Command output is on VTY2 - type ALT-F2 to see it");
 }
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h
index bdf8068..86d7bed 100644
--- a/usr.sbin/sade/sade.h
+++ b/usr.sbin/sade/sade.h
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: sysinstall.h,v 1.51 1996/04/23 01:29:32 jkh Exp $
+ * $Id: sysinstall.h,v 1.52 1996/04/25 17:31:26 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -400,7 +400,7 @@ extern int	dmenuDisplayFile(dialogMenuItem *tmp);
 extern int	dmenuSubmenu(dialogMenuItem *tmp);
 extern int	dmenuSystemCommand(dialogMenuItem *tmp);
 extern int	dmenuSystemCommandBox(dialogMenuItem *tmp);
-extern int	dmenuCancel(dialogMenuItem *tmp);
+extern int	dmenuExit(dialogMenuItem *tmp);
 extern int	dmenuSetVariable(dialogMenuItem *tmp);
 extern int	dmenuSetFlag(dialogMenuItem *tmp);
 extern int	dmenuSetValue(dialogMenuItem *tmp);
diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c
index 7208cd1..fec4cf2 100644
--- a/usr.sbin/sysinstall/disks.c
+++ b/usr.sbin/sysinstall/disks.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: disks.c,v 1.41 1996/04/23 01:29:14 jkh Exp $
+ * $Id: disks.c,v 1.42 1996/04/25 17:31:14 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -400,7 +400,7 @@ diskPartition(Device *dev, Disk *d)
     p = CheckRules(d);
     if (p) {
 	dialog_clear();
-	msgConfirm(p);
+	dialog_mesgbox("Disk partitioning warning:", p, -1, -1);
 	free(p);
     }
     restorescr(w);
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index 5194891..ab42ba8 100644
--- a/usr.sbin/sysinstall/dist.c
+++ b/usr.sbin/sysinstall/dist.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: dist.c,v 1.42 1996/04/23 01:29:17 jkh Exp $
+ * $Id: dist.c,v 1.43 1996/04/25 17:31:15 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -478,6 +478,8 @@ distExtractAll(dialogMenuItem *self)
 	msgConfirm("You haven't selected any distributions to extract.");
 	return DITEM_FAILURE;
     }
+    dialog_clear();
+    msgNotify("Attempting to install all selected distributions..");
     /* Try for 3 times around the loop, then give up. */
     while (Dists && ++retries < 3)
 	distExtract(NULL, DistTable);
diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h
index fc102dde4..c288c3d 100644
--- a/usr.sbin/sysinstall/dist.h
+++ b/usr.sbin/sysinstall/dist.h
@@ -17,7 +17,7 @@
 #define DIST_COMMERCIAL		0x1000
 #define DIST_DES		0x2000
 #define DIST_EXPERIMENTAL	0x4000
-#define DIST_ALL		0x0FFF	/* Don't include commerce, DES or experimental in "all" */
+#define DIST_ALL		0xFFFF
 
 /* Canned distribution sets */
 #define _DIST_DEVELOPER \
@@ -26,6 +26,9 @@
 #define _DIST_USER \
 	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_COMPAT1X | DIST_COMPAT20)
 
+#define _DIST_XDEV \
+	(DIST_XF86_BIN | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS)
+
 /* Subtypes for DES distribution */
 #define DIST_DES_DES		0x0001
 #define DIST_DES_SEBONES	0x0002
diff --git a/usr.sbin/sysinstall/dmenu.c b/usr.sbin/sysinstall/dmenu.c
index 7880770..7dbbd15 100644
--- a/usr.sbin/sysinstall/dmenu.c
+++ b/usr.sbin/sysinstall/dmenu.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $Id: dmenu.c,v 1.17 1996/04/23 01:29:18 jkh Exp $
+ * $Id: dmenu.c,v 1.18 1996/04/25 17:31:17 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -39,7 +39,7 @@
 
 #define MAX_MENU		15
 
-static Boolean cancelled;
+static Boolean exited;
 
 int
 dmenuDisplayFile(dialogMenuItem *tmp)
@@ -79,9 +79,9 @@ dmenuSystemCommandBox(dialogMenuItem *tmp)
 }
 
 int
-dmenuCancel(dialogMenuItem *tmp)
+dmenuExit(dialogMenuItem *tmp)
 {
-    cancelled = TRUE;
+    exited = TRUE;
     return DITEM_LEAVE_MENU;
 }
 
@@ -200,11 +200,13 @@ dmenuOpen(DMenu *menu, int *choice, int *scroll, int *curr, int *max)
 	else
 	    msgFatal("Menu: `%s' is of an unknown type\n", menu->title);
 	clearok(stdscr, TRUE);
-	if (rval)
-	    return FALSE;
-	else if (cancelled || menu->type & DMENU_SELECTION_RETURNS) {
-	    cancelled = FALSE;
+	if (exited) {
+	    exited = FALSE;
 	    return TRUE;
 	}
+	else if (rval)
+	    return FALSE;
+	else if (menu->type & DMENU_SELECTION_RETURNS)
+	    return TRUE;
     }
 }
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index f1078bf..40e03a0 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.85 1996/04/25 17:31:18 jkh Exp $
+ * $Id: install.c,v 1.86 1996/04/25 18:00:28 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -289,7 +289,7 @@ installExpress(dialogMenuItem *self)
 	return DITEM_FAILURE;
 
     if (!Dists) {
-	if (!dmenuOpenSimple(&MenuDistributions))
+	if (!dmenuOpenSimple(&MenuDistributions) && !Dists)
 	    return DITEM_FAILURE | DITEM_RESTORE | DITEM_RECREATE;
     }
 
@@ -337,7 +337,7 @@ installNovice(dialogMenuItem *self)
 	       "X11 developer oriented configurations.  You can also select a custom set\n"
 	       "of distributions if none of the provided ones are suitable.");
     while (1) {
-	if (!dmenuOpenSimple(&MenuDistributions))
+	if (!dmenuOpenSimple(&MenuDistributions) && !Dists)
 	    return DITEM_FAILURE | DITEM_RESTORE | DITEM_RECREATE;
 	
 	if (Dists || !msgYesNo("No distributions selected.  Are you sure you wish to continue?"))
diff --git a/usr.sbin/sysinstall/media.c b/usr.sbin/sysinstall/media.c
index 293e7e9..a69e7df 100644
--- a/usr.sbin/sysinstall/media.c
+++ b/usr.sbin/sysinstall/media.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: media.c,v 1.34 1996/04/25 17:31:22 jkh Exp $
+ * $Id: media.c,v 1.35 1996/04/26 18:19:34 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -87,7 +87,7 @@ mediaSetCDROM(dialogMenuItem *self)
 		   "configuration is correct and that the CDROM drive is of a supported\n"
 		   "type.  For more information, consult the hardware guide\n"
 		   "in the Doc menu.");
-	return DITEM_FAILURE;
+	return DITEM_FAILURE | DITEM_CONTINUE;
     }
     else if (cnt > 1) {
 	DMenu *menu;
@@ -128,7 +128,7 @@ mediaSetFloppy(dialogMenuItem *self)
 	msgConfirm("No floppy devices found!  Please check that your system's configuration\n"
 		   "is correct.  For more information, consult the hardware guide in the Doc\n"
 		   "menu.");
-	return DITEM_FAILURE;
+	return DITEM_FAILURE | DITEM_CONTINUE;
     }
     else if (cnt > 1) {
 	DMenu *menu;
@@ -167,7 +167,7 @@ mediaSetDOS(dialogMenuItem *self)
     cnt = deviceCount(devs);
     if (!cnt) {
 	msgConfirm("No DOS primary partitions found!  This installation method is unavailable");
-	return DITEM_FAILURE;
+	return DITEM_FAILURE | DITEM_CONTINUE;
     }
     else if (cnt > 1) {
 	DMenu *menu;
@@ -208,7 +208,7 @@ mediaSetTape(dialogMenuItem *self)
 	msgConfirm("No tape drive devices found!  Please check that your system's configuration\n"
 		   "is correct.  For more information, consult the hardware guide in the Doc\n"
 		   "menu.");
-	return DITEM_FAILURE;
+	return DITEM_FAILURE | DITEM_CONTINUE;
     }
     else if (cnt > 1) {
 	DMenu *menu;
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index e7b81ed..d381536 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.53 1996/04/26 18:19:36 jkh Exp $
+ * $Id: menus.c,v 1.54 1996/04/27 07:04:12 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -113,6 +113,22 @@ clearX11Servers(dialogMenuItem *self)
 }
 
 static int
+setX11Fonts(dialogMenuItem *self)
+{
+    XF86Dists |= DIST_XF86_FONTS;
+    XF86FontDists = DIST_XF86_FONTS_ALL;
+    return DITEM_SUCCESS | DITEM_REDRAW;
+}
+
+static int
+clearX11Fonts(dialogMenuItem *self)
+{
+    XF86Dists &= ~DIST_XF86_FONTS;
+    XF86FontDists = 0;
+    return DITEM_SUCCESS | DITEM_REDRAW;
+}
+
+static int
 checkDistDeveloper(dialogMenuItem *self)
 {
     return (Dists == _DIST_DEVELOPER && SrcDists == DIST_SRC_ALL);
@@ -121,10 +137,8 @@ checkDistDeveloper(dialogMenuItem *self)
 static int
 checkDistXDeveloper(dialogMenuItem *self)
 {
-    return (Dists == _DIST_DEVELOPER | DIST_XF86 && SrcDists == DIST_SRC_ALL &&
-	    XF86Dists == DIST_XF86_BIN | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN |
-	    DIST_XF86_SERVER | DIST_XF86_FONTS && (XF86ServerDists & DIST_XF86_SERVER_SVGA) &&
-	    (XF86FontDists & DIST_XF86_FONTS_MISC));
+    return (Dists == (_DIST_DEVELOPER | DIST_XF86) && SrcDists == DIST_SRC_ALL &&
+	    (XF86Dists & _DIST_XDEV) == _DIST_XDEV && XF86ServerDists && XF86FontDists);
 }
 
 static int
@@ -210,7 +224,7 @@ option by pressing [ENTER].",				/* prompt */
   { "7 Fixit",	"Go into repair mode with CDROM or floppy",		NULL, dmenuSubmenu, NULL, &MenuFixit },
   { "8 Upgrade","Upgrade an existing 2.0.5 system",			NULL, installUpgrade },
   { "9 Configure","Do post-install configuration of FreeBSD",		NULL, dmenuSubmenu, NULL, &MenuConfigure },
-  { "0 Exit",	"Exit this menu (and the installation)",		NULL, dmenuCancel },
+  { "0 Exit",	"Exit this menu (and the installation)",		NULL, dmenuExit },
   { NULL } },
 };
 
@@ -249,7 +263,7 @@ consult the README file.",
   { "4 Copyright","The FreeBSD Copyright notices.",			NULL, dmenuDisplayFile,	NULL, "COPYRIGHT" },
   { "5 Release","The release notes for this version of FreeBSD.",	NULL, dmenuDisplayFile, NULL, "relnotes" },
   { "6 HTML Docs","Go to the HTML documentation menu (post-install).",	NULL, docBrowser },
-  { "0 Exit",	"Exit this menu (returning to previous)",		NULL, dmenuCancel },
+  { "0 Exit",	"Exit this menu (returning to previous)",		NULL, dmenuExit },
   { NULL } },
 };
 
@@ -533,8 +547,8 @@ DMenu MenuDistributions = {
 These select what we consider to be the most reasonable defaults for the\n\
 type of system in question.  If you would prefer to pick and choose the\n\
 list of distributions yourself, simply select \"Custom\".  You can also\n\
-pick a canned distribution set and then fine-tune it with the Custom item.\n\
-When you are finished, select Cancel or chose Exit.",
+pick a canned distribution set and then fine-tune it with the Custom item.\n\n\
+When you are finished chose the Exit item or Cancel to abort.",
     "Press F1 for more information on these options.",
     "distributions",
 { { "1 Developer",	"Full sources, binaries and doc but no games [180MB]",
@@ -549,14 +563,14 @@ When you are finished, select Cancel or chose Exit.",
     checkDistXUser, distSetXUser },
   { "6 Minimal",	"The smallest configuration possible [44MB]",
     checkDistMinimum, distSetMinimum },
-  { "7 Custom",		"Specify your own distribution set [?]",
-    checkTrue, dmenuSubmenu, NULL, &MenuSubDistributions, '-', '-', '-' },
-  { "8 All",		"All sources, binaries and XFree86 binaries [700MB]",
+  { "7 All",		"All sources, binaries and XFree86 binaries [700MB]",
     checkDistEverything, distSetEverything },
+  { "8 Custom",		"Specify your own distribution set [?]",
+    NULL, dmenuSubmenu, NULL, &MenuSubDistributions, ' ', ' ', ' ' },
   { "9 Clear",		"Reset selected distribution list to nothing [0MB]",
     NULL, distReset, NULL, NULL, ' ', ' ', ' ' },
   { "0 Exit",		"Exit this menu (returning to previous)",
-    checkTrue, dmenuCancel, NULL, NULL, '<', '<', '<' },
+    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
   { NULL } },
 };
 
@@ -599,11 +613,11 @@ DES distribution out of the U.S.!  It is for U.S. customers only.",
   { "xperimnt",		"Experimental work in progress!",
     dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_EXPERIMENTAL },
   { "All",		"All sources, binaries and XFree86 binaries [700MB]",
-    NULL, distSetEverything	},
+    NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' },
   { "Clear",		"Reset all of the above [0MB]",
     NULL, distReset, NULL, NULL, ' ', ' ', ' ' },
   { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuCancel, NULL, NULL, '<', '<', '<' },
+    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
   { NULL } },
 };
 
@@ -626,7 +640,7 @@ software, please consult the release notes.",
   { "ssecure",	"Sources for DES [1MB]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SSECURE },
   { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuCancel, NULL, NULL, '<', '<', '<' },
+    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
   { NULL } },
 };
 
@@ -670,11 +684,11 @@ you wish to install.",
   { "smailcf",	"/usr/src/usr.sbin (sendmail config macros) [341K]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SMAILCF },
   { "All",	"Select all of the above [120MB]",
-    checkSrc, setSrc },
+    NULL, setSrc, NULL, NULL, ' ', ' ', ' ' },
   { "Clear",	"Reset all of the above [0MB]",
     NULL, clearSrc, NULL, NULL, ' ', ' ', ' ' },
   { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuCancel, NULL, NULL, '<', '<', '<' },
+    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
   { NULL } },
 };
 
@@ -697,7 +711,7 @@ component set and at least one entry from the Server and Font set menus.",
   { "Clear",	"Reset XFree86 distribution list",
     NULL, clearX11All },
   { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuCancel, NULL, NULL, '<', '<', '<' },
+    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
   { NULL } },
 };
 
@@ -739,7 +753,7 @@ Bin, lib, xicf, and xdcf are recommended for a minimum installaion.",
   { "Clear",	"Reset all of the above [0MB]",
     NULL, clearX11Misc, NULL, NULL, ' ', ' ', ' ' },
   { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuCancel, NULL, NULL, '<', '<', '<' },
+    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
   { NULL } },
 };
 
@@ -764,8 +778,12 @@ install.  At the minimum, you should install the standard\n\
     dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_NON },
   { "server",	"Font server [0.3MB]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SERVER },
+  { "All",	"All fonts [10MB]",
+    NULL, setX11Fonts, NULL, NULL, ' ', ' ', ' ' },
+  { "Clear",	"Reset font selections [0MB]",
+    NULL, clearX11Fonts, NULL, NULL, ' ', ' ', ' ' },
   { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuCancel, NULL, NULL, '<', '<', '<' },
+    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
   { NULL } },
 };
 
@@ -807,7 +825,7 @@ Mono servers are particularly well-suited to most LCD displays).",
   { "Clear",	"Reset all of the above [0MB]",
     NULL, clearX11Servers, NULL, NULL, ' ', ' ', ' ' },
   { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuCancel, NULL, NULL, '<', '<', '<' },
+    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
   { NULL } },
 };
 
@@ -857,7 +875,7 @@ to install it from and how you wish to allocate disk storage to FreeBSD.",
   { "5 Media",		"Choose the installation media type",	NULL, dmenuSubmenu, NULL, &MenuMedia },
   { "6 Commit",		"Perform any pending Partition/Label/Extract actions", NULL, installCommit },
   { "7 Extract",	"Just do distribution extract step",	NULL, distExtractAll },
-  { "0 Exit",		"Exit this menu (returning to previous)", NULL, dmenuCancel },
+  { "0 Exit",		"Exit this menu (returning to previous)", NULL, dmenuExit },
   { NULL } },
 };
 
@@ -920,7 +938,7 @@ software not provided in the base distributions.",
   { "C XFree86",	"Configure XFree86",
     NULL, configXFree86 },
   { "0 Exit",		"Exit this menu (returning to previous)",
-    NULL, dmenuCancel },
+    NULL, dmenuExit },
   { NULL } },
 };
 
@@ -958,7 +976,7 @@ aspects of your system's network configuration.",
   { "PCNFSD",		"Run authentication server for clients with PC-NFS.",
     NULL, configPCNFSD },
   { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuCancel, NULL, NULL, '<', '<', '<' },
+    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
   { NULL } },
 };
 
@@ -1025,7 +1043,7 @@ When you are done setting configuration options, select Cancel.",
 { { "Keymap",	"Choose an alternate keyboard map",	NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap },
   { "Repeat",	"Set the rate at which keys repeat",	NULL, dmenuSubmenu, NULL, &MenuSysconsKeyrate },
   { "Saver",	"Configure the screen saver",		NULL, dmenuSubmenu, NULL, &MenuSysconsSaver },
-  { "Exit",	"Exit this menu (returning to previous)", NULL, dmenuCancel },
+  { "Exit",	"Exit this menu (returning to previous)", NULL, dmenuExit },
   { NULL } },
 };
 
diff --git a/usr.sbin/sysinstall/msg.c b/usr.sbin/sysinstall/msg.c
index a569169..b148c1a 100644
--- a/usr.sbin/sysinstall/msg.c
+++ b/usr.sbin/sysinstall/msg.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: msg.c,v 1.30 1995/12/07 10:34:09 peter Exp $
+ * $Id: msg.c,v 1.31 1996/04/13 13:32:02 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -58,7 +58,7 @@ msgYap(char *fmt, ...)
     char *errstr;
     int attrs;
 
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     va_start(args, fmt);
     vsnprintf(errstr, FILENAME_MAX, fmt, args);
     va_end(args);
@@ -67,7 +67,6 @@ msgYap(char *fmt, ...)
     mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, errstr);
     attrset(attrs);
     refresh();
-    free(errstr);
 }
 
 /* Whack up an informational message on the status line */
@@ -88,7 +87,7 @@ msgInfo(char *fmt, ...)
 	attrset(attrs);
 	return;
     }
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     va_start(args, fmt);
     vsnprintf(errstr, FILENAME_MAX, fmt, args);
     va_end(args);
@@ -110,7 +109,6 @@ msgInfo(char *fmt, ...)
 	    msgDebug("Information: `%s'\n", errstr);
 	msgInfo(NULL);
     }
-    free(errstr);
 }
 
 /* Whack up a warning on the status line */
@@ -121,7 +119,7 @@ msgWarn(char *fmt, ...)
     char *errstr;
     int attrs;
 
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     strcpy(errstr, "Warning: ");
     va_start(args, fmt);
     vsnprintf((char *)(errstr + strlen(errstr)), FILENAME_MAX, fmt, args);
@@ -134,7 +132,6 @@ msgWarn(char *fmt, ...)
     refresh();
     if (OnVTY && isDebug())
 	msgDebug("Warning message `%s'\n", errstr);
-    free(errstr);
 }
 
 /* Whack up an error on the status line */
@@ -145,7 +142,7 @@ msgError(char *fmt, ...)
     char *errstr;
     int attrs;
 
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     strcpy(errstr, "Error: ");
     va_start(args, fmt);
     vsnprintf((char *)(errstr + strlen(errstr)), FILENAME_MAX, fmt, args);
@@ -158,7 +155,6 @@ msgError(char *fmt, ...)
     refresh();
     if (OnVTY && isDebug())
 	msgDebug("Error message `%s'\n", errstr);
-    free(errstr);
 }
 
 /* Whack up a fatal error on the status line */
@@ -169,7 +165,7 @@ msgFatal(char *fmt, ...)
     char *errstr;
     int attrs;
 
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     strcpy(errstr, "Fatal Error: ");
     va_start(args, fmt);
     vsnprintf((char *)(errstr + strlen(errstr)), FILENAME_MAX, fmt, args);
@@ -188,7 +184,6 @@ msgFatal(char *fmt, ...)
     refresh();
     if (OnVTY)
 	msgDebug("Fatal error `%s'!\n", errstr);
-    free(errstr);
     getch();
     systemShutdown();
 }
@@ -201,7 +196,7 @@ msgConfirm(char *fmt, ...)
     char *errstr;
     WINDOW *w;
 
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     va_start(args, fmt);
     vsnprintf(errstr, FILENAME_MAX, fmt, args);
     va_end(args);
@@ -215,7 +210,6 @@ msgConfirm(char *fmt, ...)
     }
     dialog_notify(errstr);
     restorescr(w);
-    free(errstr);
 }
 
 /* Put up a message in a popup information box */
@@ -225,7 +219,7 @@ msgNotify(char *fmt, ...)
     va_list args;
     char *errstr;
 
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     va_start(args, fmt);
     vsnprintf(errstr, FILENAME_MAX, fmt, args);
     va_end(args);
@@ -235,7 +229,6 @@ msgNotify(char *fmt, ...)
 	msgDebug("Notify: %s\n", errstr);
     dialog_clear();
     dialog_msgbox("Information Dialog", errstr, -1, -1, 0);
-    free(errstr);
 }
 
 /* Put up a message in a popup yes/no box and return 1 for YES, 0 for NO */
@@ -247,7 +240,7 @@ msgYesNo(char *fmt, ...)
     int ret;
     WINDOW *w;
 
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     va_start(args, fmt);
     vsnprintf(errstr, FILENAME_MAX, fmt, args);
     va_end(args);
@@ -261,7 +254,6 @@ msgYesNo(char *fmt, ...)
     }
     ret = dialog_yesno("User Confirmation Requested", errstr, -1, -1);
     restorescr(w);
-    free(errstr);
     return ret;
 }
 
@@ -275,7 +267,7 @@ msgGetInput(char *buf, char *fmt, ...)
     int rval;
     WINDOW *w;
 
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     va_start(args, fmt);
     vsnprintf(errstr, FILENAME_MAX, fmt, args);
     va_end(args);
@@ -293,7 +285,6 @@ msgGetInput(char *buf, char *fmt, ...)
     }
     rval = dialog_inputbox("Value Required", errstr, -1, -1, input_buffer);
     restorescr(w);
-    free(errstr);
     if (!rval)
 	return input_buffer;
     else
@@ -309,13 +300,12 @@ msgDebug(char *fmt, ...)
 
     if (DebugFD == -1)
 	return;
-    dbg = (char *)safe_malloc(FILENAME_MAX);
+    dbg = (char *)alloca(FILENAME_MAX);
     strcpy(dbg, "DEBUG: ");
     va_start(args, fmt);
     vsnprintf((char *)(dbg + strlen(dbg)), FILENAME_MAX, fmt, args);
     va_end(args);
     write(DebugFD, dbg, strlen(dbg));
-    free(dbg);
 }
 
 /* Tell the user there's some output to go look at */
@@ -325,7 +315,7 @@ msgWeHaveOutput(char *fmt, ...)
     va_list args;
     char *errstr;
 
-    errstr = (char *)safe_malloc(FILENAME_MAX);
+    errstr = (char *)alloca(FILENAME_MAX);
     va_start(args, fmt);
     vsnprintf(errstr, FILENAME_MAX, fmt, args);
     va_end(args);
@@ -334,7 +324,6 @@ msgWeHaveOutput(char *fmt, ...)
     msgDebug("Notify: %s\n", errstr);
     dialog_clear();
     dialog_msgbox("Information Dialog", errstr, -1, -1, 0);
-    free(errstr);
     if (OnVTY)
 	msgInfo("Command output is on VTY2 - type ALT-F2 to see it");
 }
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index bdf8068..86d7bed 100644
--- a/usr.sbin/sysinstall/sysinstall.h
+++ b/usr.sbin/sysinstall/sysinstall.h
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: sysinstall.h,v 1.51 1996/04/23 01:29:32 jkh Exp $
+ * $Id: sysinstall.h,v 1.52 1996/04/25 17:31:26 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -400,7 +400,7 @@ extern int	dmenuDisplayFile(dialogMenuItem *tmp);
 extern int	dmenuSubmenu(dialogMenuItem *tmp);
 extern int	dmenuSystemCommand(dialogMenuItem *tmp);
 extern int	dmenuSystemCommandBox(dialogMenuItem *tmp);
-extern int	dmenuCancel(dialogMenuItem *tmp);
+extern int	dmenuExit(dialogMenuItem *tmp);
 extern int	dmenuSetVariable(dialogMenuItem *tmp);
 extern int	dmenuSetFlag(dialogMenuItem *tmp);
 extern int	dmenuSetValue(dialogMenuItem *tmp);
diff --git a/usr.sbin/sysinstall/tcpip.c b/usr.sbin/sysinstall/tcpip.c
index fbde09a..1423ac4 100644
--- a/usr.sbin/sysinstall/tcpip.c
+++ b/usr.sbin/sysinstall/tcpip.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tcpip.c,v 1.35 1996/04/13 13:32:12 jkh Exp $
+ * $Id: tcpip.c,v 1.36 1996/04/23 01:29:35 jkh Exp $
  *
  * Copyright (c) 1995
  *      Gary J Palmer. All rights reserved.
@@ -545,6 +545,9 @@ tcpDeviceSelect(void)
 	/* If we're running in user mode, assume network already up */
 	if (RunningAsInit)
 	    tcpOpenDialog(devs[0]);
+	else
+	    msgConfirm("Since you're running multi-user, we'll assume\n"
+		       "that the network is already up.");
 	mediaDevice = devs[0];
 	status = TRUE;
     }
@@ -564,5 +567,5 @@ tcpMenuSelect(dialogMenuItem *self)
 {
     (void)tcpDeviceSelect();
     configResolv();
-    return DITEM_SUCCESS;
+    return DITEM_SUCCESS | DITEM_RECREATE | DITEM_RESTORE;
 }