svn commit: r215291 - in head/usr.sbin/sysinstall: . help

[Bruce Cran]

Author: brucec
Date: Sun Nov 14 10:22:09 2010
New Revision: 215291
URL: http://svn.freebsd.org/changeset/base/215291

Log:
  Remove support for cpioVerbose=medium because bsdcpio doesn't support the
  "-V" flag.
  
  PR:	bin/151821
  Submitted by:	Devin Teske <dteske at vicor.com>
  MFC after:	1 week

Modified:
  head/usr.sbin/sysinstall/help/shortcuts.hlp
  head/usr.sbin/sysinstall/media.c
  head/usr.sbin/sysinstall/sysinstall.8

Modified: head/usr.sbin/sysinstall/help/shortcuts.hlp
==============================================================================
--- head/usr.sbin/sysinstall/help/shortcuts.hlp	Sun Nov 14 10:04:48 2010	(r215290)
+++ head/usr.sbin/sysinstall/help/shortcuts.hlp	Sun Nov 14 10:22:09 2010	(r215291)
@@ -13,7 +13,7 @@ blanktime               Screen blank tim
 bootManager             Select boot manager: booteasy, standard or none
 browserBinary           Which doc browser to use (default: links)
 browserPackage          Which package to get browser from (default: links)
-cpioVerbose             How verbose to be with cpio: high, medium or low
+cpioVerbose             How verbose to be with cpio: high or low
 debug                   Extra debugging?
 defaultrouter           IP address of default route
 disk                    Which disk to operate on (ad0, da0, etc).

Modified: head/usr.sbin/sysinstall/media.c
==============================================================================
--- head/usr.sbin/sysinstall/media.c	Sun Nov 14 10:04:48 2010	(r215290)
+++ head/usr.sbin/sysinstall/media.c	Sun Nov 14 10:22:09 2010	(r215291)
@@ -117,8 +117,6 @@ cpioVerbosity()
 
     if (cp && !strcmp(cp, "high"))
 	return "-v";
-    else if (cp && !strcmp(cp, "medium"))
-	return "-V";
     return "";
 }
 
@@ -848,8 +846,6 @@ mediaSetCPIOVerbosity(dialogMenuItem *se
     }
     else {
 	if (!strcmp(cp, "low"))
-	    variable_set2(VAR_CPIO_VERBOSITY, "medium", 0);
-	else if (!strcmp(cp, "medium"))
 	    variable_set2(VAR_CPIO_VERBOSITY, "high", 0);
 	else /* must be "high" - wrap around */
 	    variable_set2(VAR_CPIO_VERBOSITY, "low", 0);

Modified: head/usr.sbin/sysinstall/sysinstall.8
==============================================================================
--- head/usr.sbin/sysinstall/sysinstall.8	Sun Nov 14 10:04:48 2010	(r215290)
+++ head/usr.sbin/sysinstall/sysinstall.8	Sun Nov 14 10:22:09 2010	(r215291)
@@ -744,8 +744,7 @@ Default: user at host
 .Sy Variables :
 .Bl -tag -width indent
 .It cpioVerbose
-Can be used to set the verbosity of cpio extractions to low, medium or
-high.
+Can be used to set the verbosity of cpio extractions to low or high.
 .El
 .It mediaGetType
 Interactively get the user to specify some type of media.