From owner-svn-src-all@FreeBSD.ORG  Sun May  9 08:22:33 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id EA6B31065670;
	Sun,  9 May 2010 08:22:33 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id D952A8FC12;
	Sun,  9 May 2010 08:22:33 +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 o498MXUC077397;
	Sun, 9 May 2010 08:22:33 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o498MXWF077394;
	Sun, 9 May 2010 08:22:33 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201005090822.o498MXWF077394@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 9 May 2010 08:22:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207811 - in stable/7/etc: . rc.d
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 May 2010 08:22:34 -0000

Author: dougb
Date: Sun May  9 08:22:33 2010
New Revision: 207811
URL: http://svn.freebsd.org/changeset/base/207811

Log:
  rc_quiet does not exist in RELENG_7, so hand-merge the part of r179870
  that I did not think was applicable here (namely bailing out of
  run_rc_command before printing the warning) but use rc_fast as the
  trigger instead of rc_quiet. The former exists in all supported branches,
  and is set at boot time so it does the job.
  
  The only remaining element that isn't already covered by 'faststart' is
  an instance of '/etc/rc.d/ipfilter resync' in rc.d/netif, so make that
  fastresync to also silence the warning there. This is similar to what
  was done in r175676, although that used quietresync (as described above).
  
  Pointed out by:	jhell <jhell@dataix.net>

Modified:
  stable/7/etc/rc.d/netif
  stable/7/etc/rc.subr

Modified: stable/7/etc/rc.d/netif
==============================================================================
--- stable/7/etc/rc.d/netif	Sun May  9 06:52:32 2010	(r207810)
+++ stable/7/etc/rc.d/netif	Sun May  9 08:22:33 2010	(r207811)
@@ -72,7 +72,7 @@ network_start()
 
 	if [ -f /etc/rc.d/ipfilter ] ; then
 		# Resync ipfilter
-		/etc/rc.d/ipfilter resync
+		/etc/rc.d/ipfilter fastresync
 	fi
 	if [ -f /etc/rc.d/bridge -a -n "$cmdifn" ] ; then
 		/etc/rc.d/bridge start $cmdifn

Modified: stable/7/etc/rc.subr
==============================================================================
--- stable/7/etc/rc.subr	Sun May  9 06:52:32 2010	(r207810)
+++ stable/7/etc/rc.subr	Sun May  9 08:22:33 2010	(r207811)
@@ -616,6 +616,9 @@ run_rc_command()
 					#
 		if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" -a -z "${rc_pid}" ]; then
 			if ! checkyesno ${rcvar}; then
+				if [ -n "$rc_fast" ]; then
+					return 0
+				fi
 				echo -n "Cannot '${rc_arg}' $name. Set ${rcvar} to "
 				echo -n "YES in /etc/rc.conf or use 'one${rc_arg}' "
 				echo "instead of '${rc_arg}'."