From owner-freebsd-bugs@FreeBSD.ORG Sun Jan 17 19:40:06 2010 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 256A11065676 for ; Sun, 17 Jan 2010 19:40:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 004318FC13 for ; Sun, 17 Jan 2010 19:40:06 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o0HJe5Xf003233 for ; Sun, 17 Jan 2010 19:40:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o0HJe5MS003232; Sun, 17 Jan 2010 19:40:05 GMT (envelope-from gnats) Resent-Date: Sun, 17 Jan 2010 19:40:05 GMT Resent-Message-Id: <201001171940.o0HJe5MS003232@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jeremy Chadwick Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EDD0F106568B for ; 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 ; 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 To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: kensmith@buffalo.edu Subject: bin/142916: Boot manager order differs between sysinstall(8) and sade(8) X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jeremy Chadwick List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Jan 2010 19:40:06 -0000 >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@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: