From eda32e7dd5b2d41e6a8a0d2122872cb36396f17f Mon Sep 17 00:00:00 2001
From: dougb <dougb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sat, 8 May 2010 21:18:22 +0000
Subject: [PATCH] MFC r206686:

Make 'stop' work even if ${name}_enable is not set.


git-svn-id: svn://svn.freebsd.org/base/stable/8@207797 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 etc/rc.subr | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/etc/rc.subr b/etc/rc.subr
index c2b1b4297..f0b27e456 100644
--- a/etc/rc.subr
+++ b/etc/rc.subr
@@ -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
-- 
2.45.0