Date: Sun, 9 May 2010 08:22:33 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r207811 - in stable/7/etc: . rc.d Message-ID: <201005090822.o498MXWF077394@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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}'."
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005090822.o498MXWF077394>