From owner-cvs-all@FreeBSD.ORG Sat Jan 21 22:14:40 2006 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B053F16A41F; Sat, 21 Jan 2006 22:14:40 +0000 (GMT) (envelope-from yar@comp.chem.msu.su) Received: from comp.chem.msu.su (comp.chem.msu.su [158.250.32.97]) by mx1.FreeBSD.org (Postfix) with ESMTP id A31CB43D45; Sat, 21 Jan 2006 22:14:39 +0000 (GMT) (envelope-from yar@comp.chem.msu.su) Received: from comp.chem.msu.su (localhost [127.0.0.1]) by comp.chem.msu.su (8.13.3/8.13.3) with ESMTP id k0LMEb8N063500; Sun, 22 Jan 2006 01:14:38 +0300 (MSK) (envelope-from yar@comp.chem.msu.su) Received: (from yar@localhost) by comp.chem.msu.su (8.13.3/8.13.3/Submit) id k0LMEbnv063496; Sun, 22 Jan 2006 01:14:37 +0300 (MSK) (envelope-from yar) Date: Sun, 22 Jan 2006 01:14:36 +0300 From: Yar Tikhiy To: "Ralf S. Engelschall" Message-ID: <20060121221436.GB59205@comp.chem.msu.su> References: <200511031317.jA3DHneM091119@repoman.freebsd.org> <20051108214237.GB50391@comp.chem.msu.su> <20051110104058.GA5664@engelschall.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20051110104058.GA5664@engelschall.com> User-Agent: Mutt/1.5.9i Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/etc/rc.d pf X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jan 2006 22:14:41 -0000 On Thu, Nov 10, 2005 at 11:40:58AM +0100, Ralf S. Engelschall wrote: > On Wed, Nov 09, 2005, Yar Tikhiy wrote: > > > On Thu, Nov 03, 2005 at 01:17:49PM +0000, Ralf S. Engelschall wrote: > > > rse 2005-11-03 13:17:49 UTC > > > > > > FreeBSD src repository > > > > > > Modified files: > > > etc/rc.d pf > > > Log: > > > There is no need to explicitly add "status" to $extra_commands in > > > the /etc/rc.d/pf script as it is implicitly added by /etc/rc.subr's > > > run_rc_command() because of the existing $pf_program. > > > > > > Submitted by: Christoph Schug > > > MFC after: 1 week > > > > > > Revision Changes Path > > > 1.11 +1 -1 src/etc/rc.d/pf > > > > I'm afraid you were relying on evil side-effects of the variable being > > named *_program. Those side-effect have been eliminated since rc.subr > > rev. 1.42. Now "status" doesn't appear among rc.d/pf valid arguments: > > > > vpc7# sh /etc/rc.d/pf > > Usage: /etc/rc.d/pf [fast|force|one](start|stop|restart|rcvar|check|reload|resync) > > > > I might be wrong, but it seems to me that your change to rc.d/pf > > should be backed out. > > > > The point is that the default "status" method is for rc.d scripts > > that handle startup and shutdown of conventional daemons, and not > > for custom tasks like the pf case. > > Ops, sorry, I've overlooked your recent change to rc.subr in CURRENT. > I've now backed-out this change from CURRENT. For RELENG_6 I've still > kept it MFC'ed it as your changes are still not MFC'ed to there. Once > you MFC your changes to RELENG_6 feel free to also back-out my change > there to be in sync there, too. Doug merged my changes to rc.subr on RELENG_6 and thus gave the green light to closing this case. I've just backed out your change to rc.d/pf on RELENG_6 as well. Thanks for your understanding. -- Yar