svn commit: r207801 - stable/7/etc

[Doug Barton]

Author: dougb
Date: Sat May  8 22:15:05 2010
New Revision: 207801
URL: http://svn.freebsd.org/changeset/base/207801

Log:
  MFC r206686:
  
  Make 'stop' work even if ${name}_enable is not set.

Modified:
  stable/7/etc/rc.subr
Directory Properties:
  stable/7/etc/   (props changed)

Modified: stable/7/etc/rc.subr
==============================================================================
--- stable/7/etc/rc.subr	Sat May  8 22:13:48 2010	(r207800)
+++ stable/7/etc/rc.subr	Sat May  8 22:15:05 2010	(r207801)
@@ -609,12 +609,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
 				echo -n "Cannot '${rc_arg}' $name. Set ${rcvar} to "
 				echo -n "YES in /etc/rc.conf or use 'one${rc_arg}' "