diff --git a/release/sysinstall/decode.c b/release/sysinstall/decode.c
index 75ee6a11acbd..4c91353a4b6d 100644
--- a/release/sysinstall/decode.c
+++ b/release/sysinstall/decode.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.13 1995/05/08 21:39:37 jkh Exp $
+ * $Id: decode.c,v 1.1 1995/05/10 07:44:54 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -97,7 +97,7 @@ dispatch(DMenuItem *tmp, char *name)
 	break;
 
     case DMENU_CANCEL:
-	return FALSE;
+	return TRUE;
 	
     case DMENU_SET_VARIABLE:
 	variable_set((char *)tmp->ptr);
diff --git a/release/sysinstall/devices.c b/release/sysinstall/devices.c
index 6fa547ad7fe2..65065851d7de 100644
--- a/release/sysinstall/devices.c
+++ b/release/sysinstall/devices.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: devices.c,v 1.11 1995/05/08 10:20:46 jkh Exp $
+ * $Id: devices.c,v 1.12 1995/05/08 21:39:33 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -159,8 +159,8 @@ print_command_summary()
     mvprintw(17, 0, "D = Delete Partition   G = Set BIOS Geometry  S = Set Bootable");
     mvprintw(18, 0, "U = Undo All Changes   W = `Wizard' Mode      ESC = Proceed to next screen");
     mvprintw(20, 0, "The currently selected partition is displayed in ");
-    attrset(A_REVERSE); addstr("reverse video"); attrset(A_NORMAL);
-    mvprintw(21, 0, "Use F1 or ? to get more help");
+    attrset(A_REVERSE); addstr("reverse video."); attrset(A_NORMAL);
+    mvprintw(21, 0, "Use F1 or ? to get more help, arrow keys to move.");
     move(0, 0);
 }
 
diff --git a/release/sysinstall/disks.c b/release/sysinstall/disks.c
index 1669d87d46e2..685981f64f75 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.14 1995/05/10 08:03:21 jkh Exp $
+ * $Id: disks.c,v 1.15 1995/05/10 09:25:49 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -179,12 +179,18 @@ get_mountpoint(struct chunk *c)
 	    return NULL;
 	}
 	else if (!strcmp(val, "/")) {
-	    if (c && c->flags & CHUNK_PAST_1024) {
-msgConfirm("This region cannot be used for your root partition as\nit is past the 1024'th cylinder mark and the system would not be\nable to boot from it.  Please pick another location for your\nroot partition and try again!");
-		return NULL;
+	    if (c) {
+	    	if (c->flags & CHUNK_PAST_1024) {
+		    msgConfirm("This region cannot be used for your root partition as\nit is past the 1024'th cylinder mark and the system would not be\nable to boot from it.  Please pick another location for your\nroot partition and try again!");
+		    return NULL;
+		}
+		else if (!(c->flags & CHUNK_BSD_COMPAT)) {
+		    msgConfirm("This region cannot be used for your root partition as\nthe FreeBSD boot code cannot deal with a root partition created in\nsuch a region.  Please choose another partition for this.");
+		    return NULL;
+		}
+		else
+		    c->flags |= CHUNK_IS_ROOT;
 	    }
-	    else if (c)
-		c->flags |= CHUNK_IS_ROOT;
 	}
 	else if (c)
 	    c->flags &= ~CHUNK_IS_ROOT;
@@ -274,7 +280,7 @@ print_fbsd_chunks(void)
 		 "Newfs");
 	attrset(A_NORMAL);
     }
-				    
+
     srow = CHUNK_SLICE_START_ROW;
     prow = CHUNK_PART_START_ROW;
     pcol = 0;
@@ -321,10 +327,11 @@ print_fbsd_chunks(void)
 	    }
 	    for (j = 0; j < MAX_MOUNT_NAME && mountpoint[j]; j++)
 		onestr[PART_MOUNT_COL + j] = mountpoint[j];
-	    sprintf(num, "%4ldMB", fbsd_chunk_info[i].c->size ?
+	    snprintf(num, 10, "%4ldMB", fbsd_chunk_info[i].c->size ?
 		    fbsd_chunk_info[i].c->size / 2048 : 0);
 	    memcpy(onestr + PART_SIZE_COL, num, strlen(num));
 	    memcpy(onestr + PART_NEWFS_COL, newfs, strlen(newfs));
+	    onestr[PART_NEWFS_COL + strlen(newfs)] = '\0';
 	    mvaddstr(prow, pcol, onestr);
 	    ++prow;
 	}
@@ -343,9 +350,9 @@ print_command_summary()
     mvprintw(21, 0, "The default target will be displayed in ");
 
     attrset(A_REVERSE);
-    addstr("reverse video");
+    addstr("reverse video.");
     attrset(A_NORMAL);
-    mvprintw(22, 0, "Use F1 or ? to get more help");
+    mvprintw(22, 0, "Use F1 or ? to get more help, arrow keys to move.");
     move(0, 0);
 }
 
diff --git a/release/sysinstall/dmenu.c b/release/sysinstall/dmenu.c
index 057443b54a6f..7c43ed283b67 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.5 1995/05/10 07:44:57 jkh Exp $
+ * $Id: dmenu.c,v 1.6 1995/05/10 08:00:47 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -43,7 +43,7 @@
 
 #include "sysinstall.h"
 
-#define MAX_MENU		15
+#define MAX_MENU		12
 
 static DMenuItem shellAction = { NULL, NULL, DMENU_SHELL_ESCAPE, NULL, 0 };
 
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index 45a5f3c1ddba..fcd4deac2fd1 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.12 1995/05/08 10:20:51 jkh Exp $
+ * $Id: install.c,v 1.13 1995/05/08 21:39:37 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -96,7 +96,9 @@ installHook(char *str)
 	    make_filesystems();
 	    scroll = choice = curr = max = 0;
 	    dmenuOpen(&MenuInstall, &choice, &scroll, &curr, &max);
+	    chdir("/mnt");
 	    cpio_extract();
+	    chroot("/mnt");
 	    distExtractAll();
 	    install_configuration_files();
 	    do_final_setup();
@@ -210,7 +212,7 @@ cpio_extract(void)
 	msgConfirm("Please Insert CPIO floppy in floppy drive 0");
 	CpioFD = open("/dev/rfd0", O_RDONLY);
     }
-    msgNotify("Extracting contents of CPIO floppy.");
+    msgNotify("Extracting contents of CPIO floppy...");
     pipe(pfd);
     zpid = fork();
     if (!zpid) {
diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c
index e6db79435591..d3bbdb2fd4cf 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.9 1995/05/08 10:20:54 jkh Exp $
+ * $Id: menus.c,v 1.10 1995/05/10 07:44:59 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -245,7 +245,7 @@ If the first site selected doesn't respond, try one of the alternates.",
 
 /* The media selection menu */
 DMenu MenuMedia = {
-DMENU_NORMAL_TYPE,
+DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
 "Choose Installation Media",
 "FreeBSD can be installed from a variety of different installation\n\
 media, ranging from floppies to the Internet.  If you're installing\n\
@@ -271,7 +271,7 @@ method.",
 
 /* The installation type menu */
 DMenu MenuInstallType = {
-DMENU_NORMAL_TYPE,
+DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
 "Choose Installation Type",
 "As a convenience, we provide several `canned' installation types.\n\
 These pick what we consider to be the most reasonable defaults for the\n\
@@ -297,7 +297,7 @@ the list of distributions yourself, simply select `custom'.",
 };
 
 DMenu MenuDistributions = {
-DMENU_MULTIPLE_TYPE,
+DMENU_MULTIPLE_TYPE | DMENU_SELECTION_RETURNS,
 "Select the distributions you wish to install.",
 "Please check off the distributions you wish to install.",
 "Press F1 for a more complete description of these distributions.",
@@ -328,7 +328,7 @@ DMENU_MULTIPLE_TYPE,
 };
 
 DMenu MenuSrcDistributions = {
-DMENU_MULTIPLE_TYPE,
+DMENU_MULTIPLE_TYPE | DMENU_SELECTION_RETURNS,
 "Select the sub-components of src you wish to install.",
 "Please check off those portions of the FreeBSD source tree\n\
 you wish to install.  A brief description of each source\n\
@@ -371,9 +371,10 @@ hierarchy is contained in parenthesis below.",
 DMenu MenuXF86 = {
 DMENU_NORMAL_TYPE,
 "XFree86 3.1.1u1 Distribution",
-"Welcome to the XFree86 3.1.1u1 distribution from\n\
-The XFree86 Project, Inc.  Recommended sequence:  Select\n\
-desired release components, configure, start it up (optional!)",
+"Welcome to the XFree86 3.1.1u1 distribution from The XFree86\n\
+Project, Inc.  Our recommended sequence is to Select the desired\n\
+release components, Configure XFree86 and then (optionally)\n\
+Start it up!",
 "Press F1 to read the XFree86 release notes for FreeBSD",
 "XFree86.hlp",
 { { "Select", "Select and load components of the XFree86 distribution",
@@ -389,8 +390,8 @@ desired release components, configure, start it up (optional!)",
 
 DMenu MenuXF86Select = {
 DMENU_NORMAL_TYPE,
-"XFree86 3.1.1 \"Late\" Distribution",
-"Please select the components you need from the XFree86 3.1.1\n\
+"XFree86 3.1.1u1 Distribution",
+"Please select the components you need from the XFree86 3.1.1u1\n\
 distribution.  Select what you need from the basic components set\n\
 and at least one entry from the Server menu and the Font set menu\n",
 "Press F1 for a sample sequence",
@@ -405,10 +406,10 @@ and at least one entry from the Server menu and the Font set menu\n",
 };
 
 DMenu MenuXF86SelectCore = {
-DMENU_MULTIPLE_TYPE,
+DMENU_MULTIPLE_TYPE | DMENU_SELECTION_RETURNS,
 "XFree86 3.1.1 base distribution types",
-"Please check off the primary XFree86 components you wish.\n\
-Those deemed most generally useful are already checked.",
+"Please check off the basic XFree86 components you wish to install.\n\
+Those deemed most generally useful are already checked off for you.",
 NULL,
 NULL,
 { { "*bin", "X client applications and shared libs [4MB].",
@@ -421,19 +422,19 @@ NULL,
 	DMENU_SET_FLAG, (void *)&XF86Dists, DIST_XF86_XDMCF, 0	},
   { "doc", "READMEs and XFree86 specific man pages [0.5MB]",
 	DMENU_SET_FLAG, (void *)&XF86Dists, DIST_XF86_DOC, 0	},
-  { "*man", "Man pages (except XFree86 specific ones in etc) [1.2MB]",
+  { "*man", "Man pages (except XFree86 specific ones) [1.2MB]",
 	DMENU_SET_FLAG, (void *)&XF86Dists, DIST_XF86_MAN, 0	},
   { "prog", "Programmer's header and library files [4MB]",
 	DMENU_SET_FLAG, (void *)&XF86Dists, DIST_XF86_PROG, 0	},
   { "link", "X Server reconfiguration kit [7.8MB]",
 	DMENU_SET_FLAG, (void *)&XF86Dists, DIST_XF86_LINK, 0	},
-  { "pex", "PEX fonts and shared libs needed by PEX applications [0.5MB]",
+  { "pex", "PEX fonts and libs needed by PEX apps [0.5MB]",
 	DMENU_SET_FLAG, (void *)&XF86Dists, DIST_XF86_PEX, 0	},
   { NULL } },
 };
 
 DMenu MenuXF86SelectFonts = {
-DMENU_MULTIPLE_TYPE,
+DMENU_MULTIPLE_TYPE | DMENU_SELECTION_RETURNS,
 "Font distribution selection.",
 "Please check off the individual font distributions you wish to\n\
 install.  At the minimum, you should certainly install the standard\n\
@@ -454,13 +455,12 @@ NULL,
 };
 
 DMenu MenuXF86SelectServer = {
-DMENU_MULTIPLE_TYPE,
+DMENU_MULTIPLE_TYPE | DMENU_SELECTION_RETURNS,
 "X Server selection.",
-"Please check off the types of X servers you wish to\n\
-install.  If you are unsure as which server will work\n\
-for your graphics card, it is recommended that try the\n\
-SVGA or VGA16 servers (the VGA16 and Mono servers are also\n\
-particularly well-suited to most LCD displays).",
+"Please check off the types of X servers you wish to install.\n\
+If you are unsure as which server will work for your graphics card,\n\
+it is recommended that try the SVGA or VGA16 servers (the VGA16 and\n\
+Mono servers are also particularly well-suited to most LCD displays).",
 "xservers.hlp",
 "Press F1 for more information on the various X server types",
 { { "*SVGA", "Standard VGA or Super VGA display",
@@ -489,7 +489,7 @@ particularly well-suited to most LCD displays).",
 };
 
 DMenu MenuDiskDevices = {
-DMENU_MULTIPLE_TYPE,
+DMENU_MULTIPLE_TYPE | DMENU_SELECTION_RETURNS,
 "Select Drive(s)",
 "Please select the drive, or drives, on which you wish to install\n\
 FreeBSD.  You need to select at least one drive containing some free\n\
@@ -526,7 +526,7 @@ NULL,
 };
 
 DMenu MenuInstallFtpOptions = {
-DMENU_RADIO_TYPE,
+DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,
 "Choose Ftp Options",
 "In case of ftp failure, how would you like this installation\n\
 to deal with it?  You have one of several choices:",
@@ -563,4 +563,3 @@ select Cancel to leave this menu.",
 	DMENU_CANCEL, (void *)NULL, 0, 0		},
   { NULL } },
 };
-
diff --git a/release/sysinstall/msg.c b/release/sysinstall/msg.c
index d8dc84b3bbee..8e2a79733f43 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.8 1995/05/07 05:58:57 jkh Exp $
+ * $Id: msg.c,v 1.9 1995/05/08 06:06:26 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -188,7 +188,7 @@ msgNotify(char *fmt, ...)
     va_end(args);
     use_helpline(NULL);
     use_helpfile(NULL);
-    dialog_notify(errstr);
+    dialog_msgbox("Information Dialog", errstr, -1, -1, 0);
     free(errstr);
 }
 
diff --git a/usr.sbin/sade/devices.c b/usr.sbin/sade/devices.c
index 6fa547ad7fe2..65065851d7de 100644
--- a/usr.sbin/sade/devices.c
+++ b/usr.sbin/sade/devices.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: devices.c,v 1.11 1995/05/08 10:20:46 jkh Exp $
+ * $Id: devices.c,v 1.12 1995/05/08 21:39:33 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -159,8 +159,8 @@ print_command_summary()
     mvprintw(17, 0, "D = Delete Partition   G = Set BIOS Geometry  S = Set Bootable");
     mvprintw(18, 0, "U = Undo All Changes   W = `Wizard' Mode      ESC = Proceed to next screen");
     mvprintw(20, 0, "The currently selected partition is displayed in ");
-    attrset(A_REVERSE); addstr("reverse video"); attrset(A_NORMAL);
-    mvprintw(21, 0, "Use F1 or ? to get more help");
+    attrset(A_REVERSE); addstr("reverse video."); attrset(A_NORMAL);
+    mvprintw(21, 0, "Use F1 or ? to get more help, arrow keys to move.");
     move(0, 0);
 }
 
diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c
index 1669d87d46e2..685981f64f75 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.14 1995/05/10 08:03:21 jkh Exp $
+ * $Id: disks.c,v 1.15 1995/05/10 09:25:49 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -179,12 +179,18 @@ get_mountpoint(struct chunk *c)
 	    return NULL;
 	}
 	else if (!strcmp(val, "/")) {
-	    if (c && c->flags & CHUNK_PAST_1024) {
-msgConfirm("This region cannot be used for your root partition as\nit is past the 1024'th cylinder mark and the system would not be\nable to boot from it.  Please pick another location for your\nroot partition and try again!");
-		return NULL;
+	    if (c) {
+	    	if (c->flags & CHUNK_PAST_1024) {
+		    msgConfirm("This region cannot be used for your root partition as\nit is past the 1024'th cylinder mark and the system would not be\nable to boot from it.  Please pick another location for your\nroot partition and try again!");
+		    return NULL;
+		}
+		else if (!(c->flags & CHUNK_BSD_COMPAT)) {
+		    msgConfirm("This region cannot be used for your root partition as\nthe FreeBSD boot code cannot deal with a root partition created in\nsuch a region.  Please choose another partition for this.");
+		    return NULL;
+		}
+		else
+		    c->flags |= CHUNK_IS_ROOT;
 	    }
-	    else if (c)
-		c->flags |= CHUNK_IS_ROOT;
 	}
 	else if (c)
 	    c->flags &= ~CHUNK_IS_ROOT;
@@ -274,7 +280,7 @@ print_fbsd_chunks(void)
 		 "Newfs");
 	attrset(A_NORMAL);
     }
-				    
+
     srow = CHUNK_SLICE_START_ROW;
     prow = CHUNK_PART_START_ROW;
     pcol = 0;
@@ -321,10 +327,11 @@ print_fbsd_chunks(void)
 	    }
 	    for (j = 0; j < MAX_MOUNT_NAME && mountpoint[j]; j++)
 		onestr[PART_MOUNT_COL + j] = mountpoint[j];
-	    sprintf(num, "%4ldMB", fbsd_chunk_info[i].c->size ?
+	    snprintf(num, 10, "%4ldMB", fbsd_chunk_info[i].c->size ?
 		    fbsd_chunk_info[i].c->size / 2048 : 0);
 	    memcpy(onestr + PART_SIZE_COL, num, strlen(num));
 	    memcpy(onestr + PART_NEWFS_COL, newfs, strlen(newfs));
+	    onestr[PART_NEWFS_COL + strlen(newfs)] = '\0';
 	    mvaddstr(prow, pcol, onestr);
 	    ++prow;
 	}
@@ -343,9 +350,9 @@ print_command_summary()
     mvprintw(21, 0, "The default target will be displayed in ");
 
     attrset(A_REVERSE);
-    addstr("reverse video");
+    addstr("reverse video.");
     attrset(A_NORMAL);
-    mvprintw(22, 0, "Use F1 or ? to get more help");
+    mvprintw(22, 0, "Use F1 or ? to get more help, arrow keys to move.");
     move(0, 0);
 }
 
diff --git a/usr.sbin/sade/dmenu.c b/usr.sbin/sade/dmenu.c
index 057443b54a6f..7c43ed283b67 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.5 1995/05/10 07:44:57 jkh Exp $
+ * $Id: dmenu.c,v 1.6 1995/05/10 08:00:47 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -43,7 +43,7 @@
 
 #include "sysinstall.h"
 
-#define MAX_MENU		15
+#define MAX_MENU		12
 
 static DMenuItem shellAction = { NULL, NULL, DMENU_SHELL_ESCAPE, NULL, 0 };
 
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 45a5f3c1ddba..fcd4deac2fd1 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.12 1995/05/08 10:20:51 jkh Exp $
+ * $Id: install.c,v 1.13 1995/05/08 21:39:37 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -96,7 +96,9 @@ installHook(char *str)
 	    make_filesystems();
 	    scroll = choice = curr = max = 0;
 	    dmenuOpen(&MenuInstall, &choice, &scroll, &curr, &max);
+	    chdir("/mnt");
 	    cpio_extract();
+	    chroot("/mnt");
 	    distExtractAll();
 	    install_configuration_files();
 	    do_final_setup();
@@ -210,7 +212,7 @@ cpio_extract(void)
 	msgConfirm("Please Insert CPIO floppy in floppy drive 0");
 	CpioFD = open("/dev/rfd0", O_RDONLY);
     }
-    msgNotify("Extracting contents of CPIO floppy.");
+    msgNotify("Extracting contents of CPIO floppy...");
     pipe(pfd);
     zpid = fork();
     if (!zpid) {
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index e6db79435591..d3bbdb2fd4cf 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.9 1995/05/08 10:20:54 jkh Exp $
+ * $Id: menus.c,v 1.10 1995/05/10 07:44:59 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -245,7 +245,7 @@ If the first site selected doesn't respond, try one of the alternates.",
 
 /* The media selection menu */
 DMenu MenuMedia = {
-DMENU_NORMAL_TYPE,
+DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
 "Choose Installation Media",
 "FreeBSD can be installed from a variety of different installation\n\
 media, ranging from floppies to the Internet.  If you're installing\n\
@@ -271,7 +271,7 @@ method.",
 
 /* The installation type menu */
 DMenu MenuInstallType = {
-DMENU_NORMAL_TYPE,
+DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
 "Choose Installation Type",
 "As a convenience, we provide several `canned' installation types.\n\
 These pick what we consider to be the most reasonable defaults for the\n\
@@ -297,7 +297,7 @@ the list of distributions yourself, simply select `custom'.",
 };
 
 DMenu MenuDistributions = {
-DMENU_MULTIPLE_TYPE,
+DMENU_MULTIPLE_TYPE | DMENU_SELECTION_RETURNS,
 "Select the distributions you wish to install.",
 "Please check off the distributions you wish to install.",
 "Press F1 for a more complete description of these distributions.",
@@ -328,7 +328,7 @@ DMENU_MULTIPLE_TYPE,
 };
 
 DMenu MenuSrcDistributions = {
-DMENU_MULTIPLE_TYPE,
+DMENU_MULTIPLE_TYPE | DMENU_SELECTION_RETURNS,
 "Select the sub-components of src you wish to install.",
 "Please check off those portions of the FreeBSD source tree\n\
 you wish to install.  A brief description of each source\n\
@@ -371,9 +371,10 @@ hierarchy is contained in parenthesis below.",
 DMenu MenuXF86 = {
 DMENU_NORMAL_TYPE,
 "XFree86 3.1.1u1 Distribution",
-"Welcome to the XFree86 3.1.1u1 distribution from\n\
-The XFree86 Project, Inc.  Recommended sequence:  Select\n\
-desired release components, configure, start it up (optional!)",
+"Welcome to the XFree86 3.1.1u1 distribution from The XFree86\n\
+Project, Inc.  Our recommended sequence is to Select the desired\n\
+release components, Configure XFree86 and then (optionally)\n\
+Start it up!",
 "Press F1 to read the XFree86 release notes for FreeBSD",
 "XFree86.hlp",
 { { "Select", "Select and load components of the XFree86 distribution",
@@ -389,8 +390,8 @@ desired release components, configure, start it up (optional!)",
 
 DMenu MenuXF86Select = {
 DMENU_NORMAL_TYPE,
-"XFree86 3.1.1 \"Late\" Distribution",
-"Please select the components you need from the XFree86 3.1.1\n\
+"XFree86 3.1.1u1 Distribution",
+"Please select the components you need from the XFree86 3.1.1u1\n\
 distribution.  Select what you need from the basic components set\n\
 and at least one entry from the Server menu and the Font set menu\n",
 "Press F1 for a sample sequence",
@@ -405,10 +406,10 @@ and at least one entry from the Server menu and the Font set menu\n",
 };
 
 DMenu MenuXF86SelectCore = {
-DMENU_MULTIPLE_TYPE,
+DMENU_MULTIPLE_TYPE | DMENU_SELECTION_RETURNS,
 "XFree86 3.1.1 base distribution types",
-"Please check off the primary XFree86 components you wish.\n\
-Those deemed most generally useful are already checked.",
+"Please check off the basic XFree86 components you wish to install.\n\
+Those deemed most generally useful are already checked off for you.",
 NULL,
 NULL,
 { { "*bin", "X client applications and shared libs [4MB].",
@@ -421,19 +422,19 @@ NULL,
 	DMENU_SET_FLAG, (void *)&XF86Dists, DIST_XF86_XDMCF, 0	},
   { "doc", "READMEs and XFree86 specific man pages [0.5MB]",
 	DMENU_SET_FLAG, (void *)&XF86Dists, DIST_XF86_DOC, 0	},
-  { "*man", "Man pages (except XFree86 specific ones in etc) [1.2MB]",
+  { "*man", "Man pages (except XFree86 specific ones) [1.2MB]",
 	DMENU_SET_FLAG, (void *)&XF86Dists, DIST_XF86_MAN, 0	},
   { "prog", "Programmer's header and library files [4MB]",
 	DMENU_SET_FLAG, (void *)&XF86Dists, DIST_XF86_PROG, 0	},
   { "link", "X Server reconfiguration kit [7.8MB]",
 	DMENU_SET_FLAG, (void *)&XF86Dists, DIST_XF86_LINK, 0	},
-  { "pex", "PEX fonts and shared libs needed by PEX applications [0.5MB]",
+  { "pex", "PEX fonts and libs needed by PEX apps [0.5MB]",
 	DMENU_SET_FLAG, (void *)&XF86Dists, DIST_XF86_PEX, 0	},
   { NULL } },
 };
 
 DMenu MenuXF86SelectFonts = {
-DMENU_MULTIPLE_TYPE,
+DMENU_MULTIPLE_TYPE | DMENU_SELECTION_RETURNS,
 "Font distribution selection.",
 "Please check off the individual font distributions you wish to\n\
 install.  At the minimum, you should certainly install the standard\n\
@@ -454,13 +455,12 @@ NULL,
 };
 
 DMenu MenuXF86SelectServer = {
-DMENU_MULTIPLE_TYPE,
+DMENU_MULTIPLE_TYPE | DMENU_SELECTION_RETURNS,
 "X Server selection.",
-"Please check off the types of X servers you wish to\n\
-install.  If you are unsure as which server will work\n\
-for your graphics card, it is recommended that try the\n\
-SVGA or VGA16 servers (the VGA16 and Mono servers are also\n\
-particularly well-suited to most LCD displays).",
+"Please check off the types of X servers you wish to install.\n\
+If you are unsure as which server will work for your graphics card,\n\
+it is recommended that try the SVGA or VGA16 servers (the VGA16 and\n\
+Mono servers are also particularly well-suited to most LCD displays).",
 "xservers.hlp",
 "Press F1 for more information on the various X server types",
 { { "*SVGA", "Standard VGA or Super VGA display",
@@ -489,7 +489,7 @@ particularly well-suited to most LCD displays).",
 };
 
 DMenu MenuDiskDevices = {
-DMENU_MULTIPLE_TYPE,
+DMENU_MULTIPLE_TYPE | DMENU_SELECTION_RETURNS,
 "Select Drive(s)",
 "Please select the drive, or drives, on which you wish to install\n\
 FreeBSD.  You need to select at least one drive containing some free\n\
@@ -526,7 +526,7 @@ NULL,
 };
 
 DMenu MenuInstallFtpOptions = {
-DMENU_RADIO_TYPE,
+DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,
 "Choose Ftp Options",
 "In case of ftp failure, how would you like this installation\n\
 to deal with it?  You have one of several choices:",
@@ -563,4 +563,3 @@ select Cancel to leave this menu.",
 	DMENU_CANCEL, (void *)NULL, 0, 0		},
   { NULL } },
 };
-
diff --git a/usr.sbin/sade/msg.c b/usr.sbin/sade/msg.c
index d8dc84b3bbee..8e2a79733f43 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.8 1995/05/07 05:58:57 jkh Exp $
+ * $Id: msg.c,v 1.9 1995/05/08 06:06:26 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -188,7 +188,7 @@ msgNotify(char *fmt, ...)
     va_end(args);
     use_helpline(NULL);
     use_helpfile(NULL);
-    dialog_notify(errstr);
+    dialog_msgbox("Information Dialog", errstr, -1, -1, 0);
     free(errstr);
 }
 
diff --git a/usr.sbin/sysinstall/devices.c b/usr.sbin/sysinstall/devices.c
index 6fa547ad7fe2..65065851d7de 100644
--- a/usr.sbin/sysinstall/devices.c
+++ b/usr.sbin/sysinstall/devices.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: devices.c,v 1.11 1995/05/08 10:20:46 jkh Exp $
+ * $Id: devices.c,v 1.12 1995/05/08 21:39:33 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -159,8 +159,8 @@ print_command_summary()
     mvprintw(17, 0, "D = Delete Partition   G = Set BIOS Geometry  S = Set Bootable");
     mvprintw(18, 0, "U = Undo All Changes   W = `Wizard' Mode      ESC = Proceed to next screen");
     mvprintw(20, 0, "The currently selected partition is displayed in ");
-    attrset(A_REVERSE); addstr("reverse video"); attrset(A_NORMAL);
-    mvprintw(21, 0, "Use F1 or ? to get more help");
+    attrset(A_REVERSE); addstr("reverse video."); attrset(A_NORMAL);
+    mvprintw(21, 0, "Use F1 or ? to get more help, arrow keys to move.");
     move(0, 0);
 }
 
diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c
index 1669d87d46e2..685981f64f75 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.14 1995/05/10 08:03:21 jkh Exp $
+ * $Id: disks.c,v 1.15 1995/05/10 09:25:49 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -179,12 +179,18 @@ get_mountpoint(struct chunk *c)
 	    return NULL;
 	}
 	else if (!strcmp(val, "/")) {
-	    if (c && c->flags & CHUNK_PAST_1024) {
-msgConfirm("This region cannot be used for your root partition as\nit is past the 1024'th cylinder mark and the system would not be\nable to boot from it.  Please pick another location for your\nroot partition and try again!");
-		return NULL;
+	    if (c) {
+	    	if (c->flags & CHUNK_PAST_1024) {
+		    msgConfirm("This region cannot be used for your root partition as\nit is past the 1024'th cylinder mark and the system would not be\nable to boot from it.  Please pick another location for your\nroot partition and try again!");
+		    return NULL;
+		}
+		else if (!(c->flags & CHUNK_BSD_COMPAT)) {
+		    msgConfirm("This region cannot be used for your root partition as\nthe FreeBSD boot code cannot deal with a root partition created in\nsuch a region.  Please choose another partition for this.");
+		    return NULL;
+		}
+		else
+		    c->flags |= CHUNK_IS_ROOT;
 	    }
-	    else if (c)
-		c->flags |= CHUNK_IS_ROOT;
 	}
 	else if (c)
 	    c->flags &= ~CHUNK_IS_ROOT;
@@ -274,7 +280,7 @@ print_fbsd_chunks(void)
 		 "Newfs");
 	attrset(A_NORMAL);
     }
-				    
+
     srow = CHUNK_SLICE_START_ROW;
     prow = CHUNK_PART_START_ROW;
     pcol = 0;
@@ -321,10 +327,11 @@ print_fbsd_chunks(void)
 	    }
 	    for (j = 0; j < MAX_MOUNT_NAME && mountpoint[j]; j++)
 		onestr[PART_MOUNT_COL + j] = mountpoint[j];
-	    sprintf(num, "%4ldMB", fbsd_chunk_info[i].c->size ?
+	    snprintf(num, 10, "%4ldMB", fbsd_chunk_info[i].c->size ?
 		    fbsd_chunk_info[i].c->size / 2048 : 0);
 	    memcpy(onestr + PART_SIZE_COL, num, strlen(num));
 	    memcpy(onestr + PART_NEWFS_COL, newfs, strlen(newfs));
+	    onestr[PART_NEWFS_COL + strlen(newfs)] = '\0';
 	    mvaddstr(prow, pcol, onestr);
 	    ++prow;
 	}
@@ -343,9 +350,9 @@ print_command_summary()
     mvprintw(21, 0, "The default target will be displayed in ");
 
     attrset(A_REVERSE);
-    addstr("reverse video");
+    addstr("reverse video.");
     attrset(A_NORMAL);
-    mvprintw(22, 0, "Use F1 or ? to get more help");
+    mvprintw(22, 0, "Use F1 or ? to get more help, arrow keys to move.");
     move(0, 0);
 }
 
diff --git a/usr.sbin/sysinstall/dmenu.c b/usr.sbin/sysinstall/dmenu.c
index 057443b54a6f..7c43ed283b67 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.5 1995/05/10 07:44:57 jkh Exp $
+ * $Id: dmenu.c,v 1.6 1995/05/10 08:00:47 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -43,7 +43,7 @@
 
 #include "sysinstall.h"
 
-#define MAX_MENU		15
+#define MAX_MENU		12
 
 static DMenuItem shellAction = { NULL, NULL, DMENU_SHELL_ESCAPE, NULL, 0 };
 
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 45a5f3c1ddba..fcd4deac2fd1 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.12 1995/05/08 10:20:51 jkh Exp $
+ * $Id: install.c,v 1.13 1995/05/08 21:39:37 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -96,7 +96,9 @@ installHook(char *str)
 	    make_filesystems();
 	    scroll = choice = curr = max = 0;
 	    dmenuOpen(&MenuInstall, &choice, &scroll, &curr, &max);
+	    chdir("/mnt");
 	    cpio_extract();
+	    chroot("/mnt");
 	    distExtractAll();
 	    install_configuration_files();
 	    do_final_setup();
@@ -210,7 +212,7 @@ cpio_extract(void)
 	msgConfirm("Please Insert CPIO floppy in floppy drive 0");
 	CpioFD = open("/dev/rfd0", O_RDONLY);
     }
-    msgNotify("Extracting contents of CPIO floppy.");
+    msgNotify("Extracting contents of CPIO floppy...");
     pipe(pfd);
     zpid = fork();
     if (!zpid) {
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index e6db79435591..d3bbdb2fd4cf 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.9 1995/05/08 10:20:54 jkh Exp $
+ * $Id: menus.c,v 1.10 1995/05/10 07:44:59 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -245,7 +245,7 @@ If the first site selected doesn't respond, try one of the alternates.",
 
 /* The media selection menu */
 DMenu MenuMedia = {
-DMENU_NORMAL_TYPE,
+DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
 "Choose Installation Media",
 "FreeBSD can be installed from a variety of different installation\n\
 media, ranging from floppies to the Internet.  If you're installing\n\
@@ -271,7 +271,7 @@ method.",
 
 /* The installation type menu */
 DMenu MenuInstallType = {
-DMENU_NORMAL_TYPE,
+DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
 "Choose Installation Type",
 "As a convenience, we provide several `canned' installation types.\n\
 These pick what we consider to be the most reasonable defaults for the\n\
@@ -297,7 +297,7 @@ the list of distributions yourself, simply select `custom'.",
 };
 
 DMenu MenuDistributions = {
-DMENU_MULTIPLE_TYPE,
+DMENU_MULTIPLE_TYPE | DMENU_SELECTION_RETURNS,
 "Select the distributions you wish to install.",
 "Please check off the distributions you wish to install.",
 "Press F1 for a more complete description of these distributions.",
@@ -328,7 +328,7 @@ DMENU_MULTIPLE_TYPE,
 };
 
 DMenu MenuSrcDistributions = {
-DMENU_MULTIPLE_TYPE,
+DMENU_MULTIPLE_TYPE | DMENU_SELECTION_RETURNS,
 "Select the sub-components of src you wish to install.",
 "Please check off those portions of the FreeBSD source tree\n\
 you wish to install.  A brief description of each source\n\
@@ -371,9 +371,10 @@ hierarchy is contained in parenthesis below.",
 DMenu MenuXF86 = {
 DMENU_NORMAL_TYPE,
 "XFree86 3.1.1u1 Distribution",
-"Welcome to the XFree86 3.1.1u1 distribution from\n\
-The XFree86 Project, Inc.  Recommended sequence:  Select\n\
-desired release components, configure, start it up (optional!)",
+"Welcome to the XFree86 3.1.1u1 distribution from The XFree86\n\
+Project, Inc.  Our recommended sequence is to Select the desired\n\
+release components, Configure XFree86 and then (optionally)\n\
+Start it up!",
 "Press F1 to read the XFree86 release notes for FreeBSD",
 "XFree86.hlp",
 { { "Select", "Select and load components of the XFree86 distribution",
@@ -389,8 +390,8 @@ desired release components, configure, start it up (optional!)",
 
 DMenu MenuXF86Select = {
 DMENU_NORMAL_TYPE,
-"XFree86 3.1.1 \"Late\" Distribution",
-"Please select the components you need from the XFree86 3.1.1\n\
+"XFree86 3.1.1u1 Distribution",
+"Please select the components you need from the XFree86 3.1.1u1\n\
 distribution.  Select what you need from the basic components set\n\
 and at least one entry from the Server menu and the Font set menu\n",
 "Press F1 for a sample sequence",
@@ -405,10 +406,10 @@ and at least one entry from the Server menu and the Font set menu\n",
 };
 
 DMenu MenuXF86SelectCore = {
-DMENU_MULTIPLE_TYPE,
+DMENU_MULTIPLE_TYPE | DMENU_SELECTION_RETURNS,
 "XFree86 3.1.1 base distribution types",
-"Please check off the primary XFree86 components you wish.\n\
-Those deemed most generally useful are already checked.",
+"Please check off the basic XFree86 components you wish to install.\n\
+Those deemed most generally useful are already checked off for you.",
 NULL,
 NULL,
 { { "*bin", "X client applications and shared libs [4MB].",
@@ -421,19 +422,19 @@ NULL,
 	DMENU_SET_FLAG, (void *)&XF86Dists, DIST_XF86_XDMCF, 0	},
   { "doc", "READMEs and XFree86 specific man pages [0.5MB]",
 	DMENU_SET_FLAG, (void *)&XF86Dists, DIST_XF86_DOC, 0	},
-  { "*man", "Man pages (except XFree86 specific ones in etc) [1.2MB]",
+  { "*man", "Man pages (except XFree86 specific ones) [1.2MB]",
 	DMENU_SET_FLAG, (void *)&XF86Dists, DIST_XF86_MAN, 0	},
   { "prog", "Programmer's header and library files [4MB]",
 	DMENU_SET_FLAG, (void *)&XF86Dists, DIST_XF86_PROG, 0	},
   { "link", "X Server reconfiguration kit [7.8MB]",
 	DMENU_SET_FLAG, (void *)&XF86Dists, DIST_XF86_LINK, 0	},
-  { "pex", "PEX fonts and shared libs needed by PEX applications [0.5MB]",
+  { "pex", "PEX fonts and libs needed by PEX apps [0.5MB]",
 	DMENU_SET_FLAG, (void *)&XF86Dists, DIST_XF86_PEX, 0	},
   { NULL } },
 };
 
 DMenu MenuXF86SelectFonts = {
-DMENU_MULTIPLE_TYPE,
+DMENU_MULTIPLE_TYPE | DMENU_SELECTION_RETURNS,
 "Font distribution selection.",
 "Please check off the individual font distributions you wish to\n\
 install.  At the minimum, you should certainly install the standard\n\
@@ -454,13 +455,12 @@ NULL,
 };
 
 DMenu MenuXF86SelectServer = {
-DMENU_MULTIPLE_TYPE,
+DMENU_MULTIPLE_TYPE | DMENU_SELECTION_RETURNS,
 "X Server selection.",
-"Please check off the types of X servers you wish to\n\
-install.  If you are unsure as which server will work\n\
-for your graphics card, it is recommended that try the\n\
-SVGA or VGA16 servers (the VGA16 and Mono servers are also\n\
-particularly well-suited to most LCD displays).",
+"Please check off the types of X servers you wish to install.\n\
+If you are unsure as which server will work for your graphics card,\n\
+it is recommended that try the SVGA or VGA16 servers (the VGA16 and\n\
+Mono servers are also particularly well-suited to most LCD displays).",
 "xservers.hlp",
 "Press F1 for more information on the various X server types",
 { { "*SVGA", "Standard VGA or Super VGA display",
@@ -489,7 +489,7 @@ particularly well-suited to most LCD displays).",
 };
 
 DMenu MenuDiskDevices = {
-DMENU_MULTIPLE_TYPE,
+DMENU_MULTIPLE_TYPE | DMENU_SELECTION_RETURNS,
 "Select Drive(s)",
 "Please select the drive, or drives, on which you wish to install\n\
 FreeBSD.  You need to select at least one drive containing some free\n\
@@ -526,7 +526,7 @@ NULL,
 };
 
 DMenu MenuInstallFtpOptions = {
-DMENU_RADIO_TYPE,
+DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,
 "Choose Ftp Options",
 "In case of ftp failure, how would you like this installation\n\
 to deal with it?  You have one of several choices:",
@@ -563,4 +563,3 @@ select Cancel to leave this menu.",
 	DMENU_CANCEL, (void *)NULL, 0, 0		},
   { NULL } },
 };
-
diff --git a/usr.sbin/sysinstall/msg.c b/usr.sbin/sysinstall/msg.c
index d8dc84b3bbee..8e2a79733f43 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.8 1995/05/07 05:58:57 jkh Exp $
+ * $Id: msg.c,v 1.9 1995/05/08 06:06:26 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -188,7 +188,7 @@ msgNotify(char *fmt, ...)
     va_end(args);
     use_helpline(NULL);
     use_helpfile(NULL);
-    dialog_notify(errstr);
+    dialog_msgbox("Information Dialog", errstr, -1, -1, 0);
     free(errstr);
 }