svn commit: r208274 - stable/8/usr.sbin/sade

[Bruce Cran]

Author: brucec
Date: Tue May 18 18:19:06 2010
New Revision: 208274
URL: http://svn.freebsd.org/changeset/base/208274

Log:
  MFC r207006:
  
  Remove the reference to DD mode, and replace "Wizard" mode with "Expert" mode.
  Also, make sure the "Q = Finish" text is visible.
  Reword the boot manager screen to try and avoid confusion, and make the
  order of the menu items match that in sysinstall.
  
  PR:		bin/142916
  Submitted by:	Jeremy Chadwick <freebsd at jdc.parodius.com>
  Approved by:    rrs (mentor)

Modified:
  stable/8/usr.sbin/sade/disks.c
  stable/8/usr.sbin/sade/menus.c
Directory Properties:
  stable/8/usr.sbin/sade/   (props changed)

Modified: stable/8/usr.sbin/sade/disks.c
==============================================================================
--- stable/8/usr.sbin/sade/disks.c	Tue May 18 18:14:12 2010	(r208273)
+++ stable/8/usr.sbin/sade/disks.c	Tue May 18 18:19:06 2010	(r208274)
@@ -202,10 +202,9 @@ static void
 print_command_summary(void)
 {
     mvprintw(14, 0, "The following commands are supported (in upper or lower case):");
-    mvprintw(16, 0, "A = Use Entire Disk   G = set Drive Geometry   C = Create Slice   F = `DD' mode");
-    mvprintw(17, 0, "D = Delete Slice      Z = Toggle Size Units    S = Set Bootable   | = Wizard m.");
-    mvprintw(18, 0, "T = Change Type       U = Undo All Changes     Q = Finish");
-    mvprintw(18, 47, "W = Write Changes");
+    mvprintw(16, 0, "A = Use Entire Disk   G = set Drive Geometry   C = Create Slice");
+    mvprintw(17, 0, "D = Delete Slice      Z = Toggle Size Units    S = Set Bootable   | = Expert m.");
+    mvprintw(18, 0, "T = Change Type       U = Undo All Changes     W = Write Changes  Q = Finish");
     mvprintw(21, 0, "Use F1 or ? to get more help, arrow keys to select.");
     move(0, 0);
 }

Modified: stable/8/usr.sbin/sade/menus.c
==============================================================================
--- stable/8/usr.sbin/sade/menus.c	Tue May 18 18:14:12 2010	(r208273)
+++ stable/8/usr.sbin/sade/menus.c	Tue May 18 18:19:06 2010	(r208274)
@@ -92,24 +92,23 @@ DMenu MenuIPLType = {
 DMenu MenuMBRType = {
     DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
     "overwrite me",		/* will be disk specific label */
-    "FreeBSD comes with a boot selector that allows you to easily\n"
+    "FreeBSD comes with a boot manager that allows you to easily\n"
     "select between FreeBSD and any other operating systems on your machine\n"
     "at boot time.  If you have more than one drive and want to boot\n"
-    "from the second one, the boot selector will also make it possible\n"
+    "from the second one, the boot manager will also make it possible\n"
     "to do so (limitations in the PC BIOS usually prevent this otherwise).\n"
-    "If you do not want a boot selector, or wish to replace an existing\n"
-    "one, select \"standard\".  If you would prefer your Master Boot\n"
-    "Record to remain untouched then select \"None\".\n\n"
-    "  NOTE:  PC-DOS users will almost certainly require \"None\"!",
-    "Press F1 to read about drive setup",
+    "If you have other operating systems installed and would like a choice when\n"
+    "booting, choose \"BootMgr\". If you would prefer to keep your existing\n"
+    "boot manager, select \"None\".\n\n",
+    "",
     "drives",
-    { { "BootMgr",	"Install the FreeBSD Boot Manager",
-	dmenuRadioCheck, dmenuSetValue, NULL, &BootMgr, 0, 0, 0, 0 },
-      { "Standard",	"Install a standard MBR (no boot manager)",
+    { { "Standard",	"Install a standard MBR (non-interactive boot manager)",
 	dmenuRadioCheck, dmenuSetValue, NULL, &BootMgr, '(', '*', ')', 1 },
-      { "None",		"Leave the Master Boot Record untouched",
+      { "BootMgr",	"Install the FreeBSD boot manager",
+	dmenuRadioCheck, dmenuSetValue, NULL, &BootMgr, '(', '*', ')', 0 },
+      { "None",		"Do not install a boot manager",
 	dmenuRadioCheck, dmenuSetValue, NULL, &BootMgr, '(', '*', ')', 2 },
-      { NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0 } },
+      { NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0 } }
 };
 #endif /* PC98 */
 #endif /* __i386__ */