MFS.

4 files changed, 13 insertions, 12 deletions

diff --git a/release/sysinstall/help/slice.hlp b/release/sysinstall/help/slice.hlp
index 22ca1e6..33280a4 100644
--- a/release/sysinstall/help/slice.hlp
+++ b/release/sysinstall/help/slice.hlp
@@ -1,4 +1,4 @@
-This is the Main Slice (or ``FDISK'' Partition) Editor.
+This is the Main Slice (``FDISK'' or PC-style Partition) Editor.
 
 Possible commands are printed at the bottom and the Master Boot Record
 contents are shown at the top.  You can move up and down with the
@@ -7,10 +7,10 @@ selection bar is over a slice whose type is marked as "unused."
 
 You are expected to leave this screen with at least one slice
 marked "FreeBSD."  Note that unlike Linux, you don't need to create
-multiple FreeBSD fdisk slice entries for different things like
+multiple FreeBSD FDISK partition entries for different things like
 swap, file systems, etc.  The usual convention is to create ONE
-FreeBSD slice per drive and then subsection this slice into
-swap and file systems with the Label editor.
+FreeBSD slice (FDISK partition) per drive and then subsection this slice
+into swap and file systems with the Label editor.
 
 No actual changes will be made to the disk until you (C)ommit from the
 Install menu or use the (W)rite option here!  You're working with what
diff --git a/release/sysinstall/label.c b/release/sysinstall/label.c
index 0b21179..4b109f4 100644
--- a/release/sysinstall/label.c
+++ b/release/sysinstall/label.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: label.c,v 1.78 1997/10/13 11:33:27 jkh Exp $
+ * $Id: label.c,v 1.63.2.15 1997/11/05 05:54:27 obrien Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -631,8 +631,8 @@ print_command_summary(void)
     mvprintw(17, 0, "The following commands are valid here (upper or lower case):");
     mvprintw(18, 0, "C = Create      D = Delete         M = Mount pt.");
     if (!RunningAsInit)
-	mvprintw(18, 47, "W = Write");
-    mvprintw(19, 0, "N = Newfs Opts  T = Newfs Toggle   U = Undo    Q = Finish");
+	mvprintw(18, 49, "W = Write");
+    mvprintw(19, 0, "N = Newfs Opts  T = Newfs Toggle   U = Undo      Q = Finish");
     mvprintw(20, 0, "A = Auto Defaults for all!");
     mvprintw(22, 0, "Use F1 or ? to get more help, arrow keys to select.");
     move(0, 0);
diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c
index 7e34898..375cef1 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.148 1997/10/25 09:27:20 jkh Exp $
+ * $Id: menus.c,v 1.149 1997/11/04 23:44:22 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -268,7 +268,7 @@ DMenu MenuIndex = {
       { "NTP Menu",		"The NTP configuration menu.",		NULL, dmenuSubmenu, NULL, &MenuNTP },
       { "Options",		"The options editor.",			NULL, optionsEditor },
       { "Packages",		"The packages collection",		NULL, configPackages },
-      { "Partition",		"The disk Partition Editor",		NULL, diskPartitionEditor },
+      { "Partition",		"The disk Slice (PC-style partition) Editor",	NULL, diskPartitionEditor },
       { "PCNFSD",		"Run authentication server for PC-NFS.", dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" },
       { "Register",		"Register yourself or company as a FreeBSD user.", dmenuVarCheck, configRegister, NULL, "registered" },
       { "Root Password",	"Set the system manager's password.",   NULL, dmenuSystemCommand, NULL, "passwd root" },
@@ -1121,7 +1121,7 @@ DMenu MenuConfigure = {
 	NULL, distExtractAll },
       { "L Label",	"The disk Label editor",
 	NULL, diskLabelEditor },
-      { "P Partition",	"The disk Partition Editor",
+      { "P Partition",	"The disk Slice (PC-style partition) Editor",
 	NULL, diskPartitionEditor },
       { "R Register",	"Register yourself or company as a FreeBSD user.", NULL, configRegister },
       { "E Exit",		"Exit this menu (returning to previous)",
diff --git a/release/sysinstall/misc.c b/release/sysinstall/misc.c
index c5d7316..d3d67a7 100644
--- a/release/sysinstall/misc.c
+++ b/release/sysinstall/misc.c
@@ -1,7 +1,7 @@
 /*
  * Miscellaneous support routines..
  *
- * $Id: misc.c,v 1.34 1997/04/03 13:44:59 jkh Exp $
+ * $Id: misc.c,v 1.35 1997/06/13 07:11:56 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -338,7 +338,8 @@ Mount(char *mountp, void *dev)
 	msgDebug("mount %s %s\n", device, mountpoint);
 
     ufsargs.fspec = device;
-    if (mount(MOUNT_UFS, mountpoint, MNT_ASYNC, (caddr_t)&ufsargs) == -1) {
+    if (mount(MOUNT_UFS, mountpoint, RunningAsInit ? MNT_ASYNC : 0,
+	(caddr_t)&ufsargs) == -1) {
 	msgConfirm("Error mounting %s on %s : %s", device, mountpoint, strerror(errno));
 	return DITEM_FAILURE;
     }