cvs commit: src/etc/rc.d pf

Yar Tikhiy yar at comp.chem.msu.su
Sat Jan 21 14:14:41 PST 2006


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 <chris at schug.net>
> > >   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


More information about the cvs-src mailing list