From owner-svn-src-all@FreeBSD.ORG Tue Feb 14 12:47:57 2012 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 E492A106564A; Tue, 14 Feb 2012 12:47:57 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B7D798FC0A; Tue, 14 Feb 2012 12:47:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1EClv5K098974; Tue, 14 Feb 2012 12:47:57 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1EClvFs098970; Tue, 14 Feb 2012 12:47:57 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201202141247.q1EClvFs098970@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Tue, 14 Feb 2012 12:47:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231677 - in stable/8: etc etc/rc.d share/man/man8 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: Tue, 14 Feb 2012 12:47:58 -0000 Author: des Date: Tue Feb 14 12:47:57 2012 New Revision: 231677 URL: http://svn.freebsd.org/changeset/base/231677 Log: MFH r230007, r230388: document quiet*, fix devd/dhclient interaction. Modified: stable/8/etc/rc.d/dhclient stable/8/etc/rc.subr stable/8/share/man/man8/rc.subr.8 Directory Properties: stable/8/etc/ (props changed) stable/8/share/man/ (props changed) stable/8/share/man/man8/ (props changed) Modified: stable/8/etc/rc.d/dhclient ============================================================================== --- stable/8/etc/rc.d/dhclient Tue Feb 14 12:43:33 2012 (r231676) +++ stable/8/etc/rc.d/dhclient Tue Feb 14 12:47:57 2012 (r231677) @@ -22,7 +22,14 @@ stop_precmd="dhclient_pre_check" dhclient_pre_check() { if [ -z "${rc_force}" ] && ! dhcpif $ifn; then - err 1 "'$ifn' is not a DHCP-enabled interface" + local msg + msg="'$ifn' is not a DHCP-enabled interface" + if [ -z "${rc_quiet}" ]; then + echo "$msg" + else + debug "$msg" + fi + exit 1 fi } Modified: stable/8/etc/rc.subr ============================================================================== --- stable/8/etc/rc.subr Tue Feb 14 12:43:33 2012 (r231676) +++ stable/8/etc/rc.subr Tue Feb 14 12:47:57 2012 (r231677) @@ -1121,7 +1121,7 @@ load_rc_config_var() # rc_usage() { - echo -n 1>&2 "Usage: $0 [fast|force|one](" + echo -n 1>&2 "Usage: $0 [fast|force|one|quiet](" _sep= for _elem; do Modified: stable/8/share/man/man8/rc.subr.8 ============================================================================== --- stable/8/share/man/man8/rc.subr.8 Tue Feb 14 12:43:33 2012 (r231676) +++ stable/8/share/man/man8/rc.subr.8 Tue Feb 14 12:47:57 2012 (r231677) @@ -375,7 +375,7 @@ with being the list of valid arguments prefixed by .Sm off -.Dq Bq Li fast | force | one . +.Dq Bq Li fast | force | one | quiet . .Sm on .It Ic reverse_list Ar item ... Print the list of @@ -463,6 +463,22 @@ Skip the checks for being set to .Dq Li YES , but performs all the other prerequisite tests. +.It Li quiet +Inhibits some verbose diagnostics. +Currently, this includes messages +.Qq Starting ${name} +(as checked by +.Ic check_startmsgs +inside +.Nm ) +and errors about usage of services that are not enabled in +.Xr rc.conf 5 . +This prefix also sets +.Va rc_quiet Ns = Ns Li YES . +.Em Please, note: +.Va rc_quiet +is not intended to completely mask all debug and warning messages, +but only certain small classes of them. .El .Pp .Ic run_rc_command