Date: Sat, 8 May 2010 21:18:23 +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-8@freebsd.org Subject: svn commit: r207797 - stable/8/etc Message-ID: <201005082118.o48LINMG031452@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Sat May 8 21:18:22 2010 New Revision: 207797 URL: http://svn.freebsd.org/changeset/base/207797 Log: MFC r206686: Make 'stop' work even if ${name}_enable is not set. Modified: stable/8/etc/rc.subr Directory Properties: stable/8/etc/ (props changed) Modified: stable/8/etc/rc.subr ============================================================================== --- stable/8/etc/rc.subr Sat May 8 20:34:01 2010 (r207796) +++ stable/8/etc/rc.subr Sat May 8 21:18:22 2010 (r207797) @@ -663,12 +663,12 @@ run_rc_command() if [ "$_elem" != "$rc_arg" ]; then continue fi - # if ${rcvar} is set, and $1 is not - # "rcvar", then run + # if ${rcvar} is set, $1 is not "rcvar" + # and ${rc_pid} is not set, then run # checkyesno ${rcvar} # and return if that failed # - if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" ]; then + if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" -a -z "${rc_pid}" ]; then if ! checkyesno ${rcvar}; then if [ -n "${rc_quiet}" ]; then return 0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005082118.o48LINMG031452>