From owner-svn-src-stable@FreeBSD.ORG Tue May 18 18:20:12 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 274EA1065679; Tue, 18 May 2010 18:20:12 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0BE208FC1B; Tue, 18 May 2010 18:20:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4IIKBHk029897; Tue, 18 May 2010 18:20:11 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4IIKBgD029894; Tue, 18 May 2010 18:20:11 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201005181820.o4IIKBgD029894@svn.freebsd.org> From: Bruce Cran Date: Tue, 18 May 2010 18:20:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r208275 - stable/8/usr.sbin/sysinstall X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 May 2010 18:20:12 -0000 Author: brucec Date: Tue May 18 18:20:11 2010 New Revision: 208275 URL: http://svn.freebsd.org/changeset/base/208275 Log: MFC r207005: Make the "Q = Finish" text visible when running sysinstall as a normal application. Reword the boot manager screen to try and avoid confusion. Approved by: rrs (mentor) Modified: stable/8/usr.sbin/sysinstall/disks.c stable/8/usr.sbin/sysinstall/menus.c Directory Properties: stable/8/usr.sbin/sysinstall/ (props changed) Modified: stable/8/usr.sbin/sysinstall/disks.c ============================================================================== --- stable/8/usr.sbin/sysinstall/disks.c Tue May 18 18:19:06 2010 (r208274) +++ stable/8/usr.sbin/sysinstall/disks.c Tue May 18 18:20:11 2010 (r208275) @@ -207,9 +207,12 @@ 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"); 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 Q = Finish"); + mvprintw(18, 0, "T = Change Type U = Undo All Changes"); + if (!RunningAsInit) - mvprintw(18, 47, "W = Write Changes"); + mvprintw(18, 47, "W = Write Changes Q = Finish"); + else + mvprintw(18, 47, "Q = Finish"); mvprintw(21, 0, "Use F1 or ? to get more help, arrow keys to select."); move(0, 0); } Modified: stable/8/usr.sbin/sysinstall/menus.c ============================================================================== --- stable/8/usr.sbin/sysinstall/menus.c Tue May 18 18:19:06 2010 (r208274) +++ stable/8/usr.sbin/sysinstall/menus.c Tue May 18 18:20:11 2010 (r208275) @@ -1179,20 +1179,16 @@ DMenu MenuMBRType = { "at boot time. If you have more than one drive and want to boot\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 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", + "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", - { { "Standard", "Install a standard MBR (no boot manager)", + { { "Standard", "Install a standard MBR (non-interactive 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", + { "None", "Do not install a boot manager", dmenuRadioCheck, dmenuSetValue, NULL, &BootMgr, '(', '*', ')', 2 }, { NULL } }, };