From owner-svn-src-all@FreeBSD.ORG Wed Dec 31 20:47:48 2008 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C0011106564A; Wed, 31 Dec 2008 20:47:48 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id ADF658FC13; Wed, 31 Dec 2008 20:47:48 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBVKlmv7035075; Wed, 31 Dec 2008 20:47:48 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBVKlmE0035074; Wed, 31 Dec 2008 20:47:48 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <200812312047.mBVKlmE0035074@svn.freebsd.org> From: Ken Smith Date: Wed, 31 Dec 2008 20:47:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r186657 - head/usr.sbin/sysinstall X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Dec 2008 20:47:49 -0000 Author: kensmith Date: Wed Dec 31 20:47:48 2008 New Revision: 186657 URL: http://svn.freebsd.org/changeset/base/186657 Log: Explicitly tell the users what a "down side" to using the boot manager is, consistently call it the boot manager, and switch the order the options are presented so no boot manager is first in the list (and hence more or less the default). This area will probably be rototilled more before 8.0 comes out. Modified: head/usr.sbin/sysinstall/menus.c Modified: head/usr.sbin/sysinstall/menus.c ============================================================================== --- head/usr.sbin/sysinstall/menus.c Wed Dec 31 17:43:28 2008 (r186656) +++ head/usr.sbin/sysinstall/menus.c Wed Dec 31 20:47:48 2008 (r186657) @@ -1074,21 +1074,24 @@ 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" + "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 }, - { "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 } },