From owner-svn-src-stable-7@FreeBSD.ORG Tue Feb 22 17:50:33 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AB85F106566B; Tue, 22 Feb 2011 17:50:33 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7E7FA8FC13; Tue, 22 Feb 2011 17:50:33 +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 p1MHoXvG016680; Tue, 22 Feb 2011 17:50:33 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1MHoX9Q016677; Tue, 22 Feb 2011 17:50:33 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102221750.p1MHoX9Q016677@svn.freebsd.org> From: Bruce Cran Date: Tue, 22 Feb 2011 17:50:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218956 - stable/7/usr.sbin/sysinstall X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 17:50:33 -0000 Author: brucec Date: Tue Feb 22 17:50:33 2011 New Revision: 218956 URL: http://svn.freebsd.org/changeset/base/218956 Log: MFC r218839, r218840, r218841: In the distribution list, 'A' is listed as the key to press to select both 'All' and 'Minimal'. Update the keys for Minimal and Custom to avoid the conflict. Remove the quotas option from the Startup Services menu. GENERIC has no support for quotas so this option has no effect. Allow users to create ufs1 filesystems via the noninteractive install.cfg system. PR: bin/153809 PR: bin/123237 PR: bin/113979 Modified: stable/7/usr.sbin/sysinstall/label.c stable/7/usr.sbin/sysinstall/menus.c Directory Properties: stable/7/usr.sbin/sysinstall/ (props changed) Modified: stable/7/usr.sbin/sysinstall/label.c ============================================================================== --- stable/7/usr.sbin/sysinstall/label.c Tue Feb 22 17:43:09 2011 (r218955) +++ stable/7/usr.sbin/sysinstall/label.c Tue Feb 22 17:50:33 2011 (r218956) @@ -1674,6 +1674,8 @@ diskLabelNonInteractive(Device *dev) pi = tmp->private_data = new_part(PART_FILESYSTEM, mpoint, TRUE); tmp->private_free = safe_free; pi->newfs_data.newfs_ufs.softupdates = soft; + if (!strcmp(typ, "ufs1")) + pi->newfs_data.newfs_ufs.ufs1 = TRUE; } } } Modified: stable/7/usr.sbin/sysinstall/menus.c ============================================================================== --- stable/7/usr.sbin/sysinstall/menus.c Tue Feb 22 17:43:09 2011 (r218955) +++ stable/7/usr.sbin/sysinstall/menus.c Tue Feb 22 17:50:33 2011 (r218956) @@ -922,9 +922,9 @@ DMenu MenuDistributions = { checkDistUser, distSetUser }, { "9 X-User", "Same as above + X Window System", checkDistXUser, distSetXUser }, - { "A Minimal", "The smallest configuration possible", + { "B Minimal", "The smallest configuration possible", checkDistMinimum, distSetMinimum }, - { "B Custom", "Specify your own distribution set", + { "C Custom", "Specify your own distribution set", NULL, dmenuSubmenu, NULL, &MenuSubDistributions, '>', '>', '>' }, { NULL } }, }; @@ -1263,8 +1263,6 @@ DMenu MenuStartup = { { " OSF/1", "This host wants to be able to run DEC OSF/1 binaries.", dmenuVarCheck, configOSF1, NULL, VAR_OSF1_ENABLE "=YES" }, #endif - { " quotas", "This host wishes to check quotas on startup.", - dmenuVarCheck, dmenuToggleVariable, NULL, "check_quotas=YES" }, { NULL } }, };