From owner-svn-src-all@FreeBSD.ORG Sun Nov 14 10:22:10 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1AAB31065672; Sun, 14 Nov 2010 10:22:10 +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 E21788FC19; Sun, 14 Nov 2010 10:22:09 +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 oAEAM9uo077833; Sun, 14 Nov 2010 10:22:09 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAEAM9Qm077829; Sun, 14 Nov 2010 10:22:09 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201011141022.oAEAM9Qm077829@svn.freebsd.org> From: Bruce Cran Date: Sun, 14 Nov 2010 10:22:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r215291 - in head/usr.sbin/sysinstall: . help X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Nov 2010 10:22:10 -0000 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 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@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.