From owner-svn-src-stable@FreeBSD.ORG  Fri Apr 22 23:44:25 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7068B106566C;
	Fri, 22 Apr 2011 23:44:25 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5D2888FC08;
	Fri, 22 Apr 2011 23:44:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p3MNiP3k062725;
	Fri, 22 Apr 2011 23:44:25 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3MNiPJR062723;
	Fri, 22 Apr 2011 23:44:25 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201104222344.p3MNiPJR062723@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Fri, 22 Apr 2011 23:44:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220958 - stable/8/etc
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Apr 2011 23:44:25 -0000

Author: dougb
Date: Fri Apr 22 23:44:25 2011
New Revision: 220958
URL: http://svn.freebsd.org/changeset/base/220958

Log:
  MFC r220760:
  
  The change in r206686 to allow the stop argument to work for a service
  that is running even though not _enable'd had an annoying side effect.
  If the service was already started at boot time by another means when
  the related script came around again in rcorder it would start again,
  regardless of _enable, because there was a valid pid.
  
  So, split the test into 2 parts, one for (!rcvar && !stop), and one
  for (stop && !valid_pid). This preserves the behavior from r206686
  while preventing the undesired side effect.

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

Modified: stable/8/etc/rc.subr
==============================================================================
--- stable/8/etc/rc.subr	Fri Apr 22 23:42:23 2011	(r220957)
+++ stable/8/etc/rc.subr	Fri Apr 22 23:44:25 2011	(r220958)
@@ -651,7 +651,8 @@ run_rc_command()
 					#	checkyesno ${rcvar}
 					# and return if that failed
 					#
-		if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" -a -z "${rc_pid}" ]; then
+		if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" -a "$rc_arg" != "stop" ] ||
+		    [ -n "${rcvar}" -a "$rc_arg" = "stop" -a -z "${rc_pid}" ]; then
 			if ! checkyesno ${rcvar}; then
 				if [ -n "${rc_quiet}" ]; then
 					return 0