From owner-cvs-all@FreeBSD.ORG Thu Nov 10 10:41:17 2005 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 626BC16A41F; Thu, 10 Nov 2005 10:41:17 +0000 (GMT) (envelope-from rse@engelschall.com) Received: from visp1.engelschall.com (visp1.engelschall.com [195.30.6.144]) by mx1.FreeBSD.org (Postfix) with ESMTP id C4F2643D48; Thu, 10 Nov 2005 10:41:16 +0000 (GMT) (envelope-from rse@engelschall.com) Received: by visp1.engelschall.com (Postfix, from userid 21100) id 175E11B44837; Thu, 10 Nov 2005 11:41:18 +0100 (CET) Received: by en1.engelschall.com (Postfix, from userid 10000) id 90489A17F8; Thu, 10 Nov 2005 11:40:58 +0100 (CET) Date: Thu, 10 Nov 2005 11:40:58 +0100 From: "Ralf S. Engelschall" To: Yar Tikhiy Message-ID: <20051110104058.GA5664@engelschall.com> References: <200511031317.jA3DHneM091119@repoman.freebsd.org> <20051108214237.GB50391@comp.chem.msu.su> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20051108214237.GB50391@comp.chem.msu.su> Organization: FreeBSD User-Agent: Mutt/1.5.11 OpenPKG/CURRENT 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 Reply-To: "Ralf S. Engelschall" List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Nov 2005 10:41:17 -0000 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. -- rse@FreeBSD.org Ralf S. Engelschall FreeBSD.org/~rse rse@engelschall.com FreeBSD committer www.engelschall.com