From jdc@koitsu.dyndns.org  Sun Jan 17 19:37:06 2010
Return-Path: <jdc@koitsu.dyndns.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EDD0F106568B
	for <freebsd-gnats-submit@freebsd.org>; Sun, 17 Jan 2010 19:37:05 +0000 (UTC)
	(envelope-from jdc@koitsu.dyndns.org)
Received: from qmta02.emeryville.ca.mail.comcast.net (qmta02.emeryville.ca.mail.comcast.net [76.96.30.24])
	by mx1.freebsd.org (Postfix) with ESMTP id D7EE08FC15
	for <freebsd-gnats-submit@freebsd.org>; Sun, 17 Jan 2010 19:37:04 +0000 (UTC)
Received: from omta09.emeryville.ca.mail.comcast.net ([76.96.30.20])
	by qmta02.emeryville.ca.mail.comcast.net with comcast
	id WjMA1d00H0S2fkCA2jd5Dx; Sun, 17 Jan 2010 19:37:05 +0000
Received: from koitsu.dyndns.org ([98.248.46.159])
	by omta09.emeryville.ca.mail.comcast.net with comcast
	id Wjd41d0043S48mS8Vjd4Cs; Sun, 17 Jan 2010 19:37:05 +0000
Received: by icarus.home.lan (Postfix, from userid 1000)
	id 3879B1E3033; Sun, 17 Jan 2010 11:37:03 -0800 (PST)
Message-Id: <20100117193703.3879B1E3033@icarus.home.lan>
Date: Sun, 17 Jan 2010 11:37:03 -0800 (PST)
From: Jeremy Chadwick <freebsd@jdc.parodius.com>
Reply-To: Jeremy Chadwick <freebsd@jdc.parodius.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: kensmith@buffalo.edu
Subject: Boot manager order differs between sysinstall(8) and sade(8)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         142916
>Category:       bin
>Synopsis:       Boot manager order differs between sysinstall(8) and sade(8)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    brucec
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 17 19:40:05 UTC 2010
>Closed-Date:    Sat May 22 20:59:54 UTC 2010
>Last-Modified:  Sat May 22 20:59:54 UTC 2010
>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@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:
Responsible-Changed-From-To: freebsd-bugs->brucec  
Responsible-Changed-By: brucec 
Responsible-Changed-When: Tue Mar 2 23:21:18 UTC 2010 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142916 
State-Changed-From-To: open->patched 
State-Changed-By: brucec 
State-Changed-When: Wed Apr 21 19:07:58 UTC 2010 
State-Changed-Why:  
Fixed in HEAD. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142916 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/142916: commit references a PR
Date: Wed, 21 Apr 2010 19:07:47 +0000 (UTC)

 Author: brucec
 Date: Wed Apr 21 19:03:34 2010
 New Revision: 207006
 URL: http://svn.freebsd.org/changeset/base/207006
 
 Log:
   Remove the reference to DD mode, and replace 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>
   Reviewed by:	randi
   Approved by:	rrs (mentor)
   MFC after:	1 week
 
 Modified:
   head/usr.sbin/sade/disks.c
   head/usr.sbin/sade/menus.c
 
 Modified: head/usr.sbin/sade/disks.c
 ==============================================================================
 --- head/usr.sbin/sade/disks.c	Wed Apr 21 18:55:44 2010	(r207005)
 +++ head/usr.sbin/sade/disks.c	Wed Apr 21 19:03:34 2010	(r207006)
 @@ -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: head/usr.sbin/sade/menus.c
 ==============================================================================
 --- head/usr.sbin/sade/menus.c	Wed Apr 21 18:55:44 2010	(r207005)
 +++ head/usr.sbin/sade/menus.c	Wed Apr 21 19:03:34 2010	(r207006)
 @@ -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__ */
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/142916: commit references a PR
Date: Tue, 18 May 2010 18:19:16 +0000 (UTC)

 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__ */
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: brucec 
State-Changed-When: Sat May 22 20:59:35 UTC 2010 
State-Changed-Why:  
Patch has been MFC'd to stable/8. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142916 
>Unformatted:
