From ccfa5fafe29ad0ea8d4afda9f09e6ad7bd023abc Mon Sep 17 00:00:00 2001 From: Rebecca Cran Date: Sun, 14 Nov 2010 10:22:09 +0000 Subject: [PATCH] Remove support for cpioVerbose=medium because bsdcpio doesn't support the "-V" flag. PR: bin/151821 Submitted by: Devin Teske MFC after: 1 week --- usr.sbin/sysinstall/help/shortcuts.hlp | 2 +- usr.sbin/sysinstall/media.c | 4 ---- usr.sbin/sysinstall/sysinstall.8 | 3 +-- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/usr.sbin/sysinstall/help/shortcuts.hlp b/usr.sbin/sysinstall/help/shortcuts.hlp index 553e96fc211..9ec03d0e1ef 100644 --- a/usr.sbin/sysinstall/help/shortcuts.hlp +++ b/usr.sbin/sysinstall/help/shortcuts.hlp @@ -13,7 +13,7 @@ blanktime Screen blank time setting in seconds 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). diff --git a/usr.sbin/sysinstall/media.c b/usr.sbin/sysinstall/media.c index fe89d705cef..e2f6c41f64a 100644 --- a/usr.sbin/sysinstall/media.c +++ b/usr.sbin/sysinstall/media.c @@ -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 *self) } 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); diff --git a/usr.sbin/sysinstall/sysinstall.8 b/usr.sbin/sysinstall/sysinstall.8 index 16dd806a524..ad6760c75ba 100644 --- a/usr.sbin/sysinstall/sysinstall.8 +++ b/usr.sbin/sysinstall/sysinstall.8 @@ -744,8 +744,7 @@ Default: user@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.