summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorbrucec <brucec@FreeBSD.org>2010-11-14 10:22:09 +0000
committerbrucec <brucec@FreeBSD.org>2010-11-14 10:22:09 +0000
commit84e7baa55e13761b33adf2012be421f0eef120b7 (patch)
tree6c94da41f986ef280ce279c9c798f706d6fdde4e /usr.sbin
parent4d30e0fd9a5babd50751376833748758fe61b1c9 (diff)
downloadFreeBSD-src-84e7baa55e13761b33adf2012be421f0eef120b7.zip
FreeBSD-src-84e7baa55e13761b33adf2012be421f0eef120b7.tar.gz
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
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/sysinstall/help/shortcuts.hlp2
-rw-r--r--usr.sbin/sysinstall/media.c4
-rw-r--r--usr.sbin/sysinstall/sysinstall.83
3 files changed, 2 insertions, 7 deletions
diff --git a/usr.sbin/sysinstall/help/shortcuts.hlp b/usr.sbin/sysinstall/help/shortcuts.hlp
index 553e96f..9ec03d0 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 fe89d70..e2f6c41 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 16dd806..ad6760c 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.
OpenPOWER on IntegriCloud