svn commit: r206686 - head/etc

[Doug Barton]

Author: dougb
Date: Thu Apr 15 21:18:24 2010
New Revision: 206686
URL: http://svn.freebsd.org/changeset/base/206686

Log:
  If a service is running, make 'stop' work even if ${name}_enable
  is not set.
  
  PR:		conf/130414
  Submitted by:	Dominic Fandrey <kamikaze at bsdforen.de>
  Reviewed by:	freebsd-rc@

Modified:
  head/etc/rc.subr

Modified: head/etc/rc.subr
==============================================================================
--- head/etc/rc.subr	Thu Apr 15 20:48:57 2010	(r206685)
+++ head/etc/rc.subr	Thu Apr 15 21:18:24 2010	(r206686)
@@ -646,12 +646,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