svn commit: r218956 - stable/7/usr.sbin/sysinstall

[Bruce Cran]

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 } },
 };