bin/142916: Boot manager order differs between sysinstall(8) and sade(8)

[Jeremy Chadwick]

>Number:         142916
>Category:       bin
>Synopsis:       Boot manager order differs between sysinstall(8) and sade(8)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 17 19:40:05 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Jeremy Chadwick
>Release:        FreeBSD 8.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD icarus.home.lan 8.0-STABLE FreeBSD 8.0-STABLE #0: Sat Jan 16 17:48:04 PST 2010 root at icarus.home.lan:/usr/obj/usr/src/sys/X7SBA_RELENG_8_amd64 amd64
>Description:
	When using either sysinstall(8) or sade(8) to choose what kind of
	boot manager (Standard, FreeBSD Boot Manager, or None), the order of
	choices differs between the utilities.

	sysinstall(8) lists the order as Standard, BootMgr, None.  sade(8)
	lists the order as BootMgr, Standard, None.

	The order change was committed over a year ago to sysinstall(8) (see
	rev. 1.437 below), but not to sade(8).

	http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.sbin/sysinstall/menus.c
>How-To-Repeat:
	n/a
>Fix:
	Apply the change to sade(8)'s menus.c to keep things in sync.
	Attached is a patch based on the official sysinstall(8) diff.

	http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.sbin/sysinstall/menus.c.diff?r1=1.436;r2=1.437

	Here we go:

--- src/usr.sbin/sade/menus.c.orig	2009-08-03 01:13:06.000000000 -0700
+++ src/usr.sbin/sade/menus.c	2010-01-17 11:31:31.000000000 -0800
@@ -92,21 +92,24 @@
 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"
+    "If you will only have FreeBSD on the machine the boot manager is\n"
+    "not needed and it slows down the boot while offering you the choice\n"
+    "of which operating system to boot.  If you do not want a boot\n"
+    "manager, or wish to replace an existing one, select \"standard\".\n"
+    "If you would prefer your Master Boot Record remain untouched then\n"
+    "select \"None\".\n\n"
     "  NOTE:  PC-DOS users will almost certainly require \"None\"!",
     "Press F1 to read about drive setup",
     "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 (no boot manager)",
 	dmenuRadioCheck, dmenuSetValue, NULL, &BootMgr, '(', '*', ')', 1 },
+      { "BootMgr",      "Install the FreeBSD Boot Manager",
+        dmenuRadioCheck, dmenuSetValue, NULL, &BootMgr, '(', '*', ')', 0 },
       { "None",		"Leave the Master Boot Record untouched",
 	dmenuRadioCheck, dmenuSetValue, NULL, &BootMgr, '(', '*', ')', 2 },
       { NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0 } },
>Release-Note:
>Audit-Trail:
>Unformatted: