From owner-cvs-src-old@FreeBSD.ORG  Fri Apr 22 23:45:52 2011
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 85899106564A
	for <cvs-src-old@freebsd.org>; Fri, 22 Apr 2011 23:45:52 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 71F008FC1F
	for <cvs-src-old@freebsd.org>; Fri, 22 Apr 2011 23:45:52 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id p3MNjqKJ098934
	for <cvs-src-old@freebsd.org>; Fri, 22 Apr 2011 23:45:52 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p3MNjqGZ098933
	for cvs-src-old@freebsd.org; Fri, 22 Apr 2011 23:45:52 GMT
	(envelope-from dougb@repoman.freebsd.org)
Message-Id: <201104222345.p3MNjqGZ098933@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	dougb@repoman.freebsd.org using -f
From: Doug Barton <dougb@FreeBSD.org>
Date: Fri, 22 Apr 2011 23:45:33 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_7
Subject: cvs commit: src/etc rc.subr
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Apr 2011 23:45:52 -0000

dougb       2011-04-22 23:45:33 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_7)
    etc                  rc.subr 
  Log:
  SVN rev 220959 on 2011-04-22 23:45:33Z by dougb
  
  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. [1]
  
  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.
  
  Revision   Changes    Path
  1.77.2.10  +2 -1      src/etc/rc.subr