diff options
| author | rse <rse@FreeBSD.org> | 2005-11-10 10:40:15 +0000 |
|---|---|---|
| committer | rse <rse@FreeBSD.org> | 2005-11-10 10:40:15 +0000 |
| commit | 439f89ac76f92a161885034fabf60ff2b5ee49f4 (patch) | |
| tree | dbe92c3b819cd2bdc35ec21bbd02e12e21c6dc66 /etc/rc.d | |
| parent | 7813d28e855b800b74ddea47bcd14b51193e8892 (diff) | |
| download | FreeBSD-src-439f89ac76f92a161885034fabf60ff2b5ee49f4.zip FreeBSD-src-439f89ac76f92a161885034fabf60ff2b5ee49f4.tar.gz | |
Backout r1.11...
> > 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@schug.net>
...because as yar@ points out: "[...] you were relying on evil
side-effects of the variable being named *_program. hose side-effect
have been eliminated since rc.subr rev. 1.42. [...] 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."
The change is still valid in RELENG_6 (and still doesn't have to be
backed out) as long as rc.subr:r1.42 is not MFC'ed to RELENG_6, too.
Diffstat (limited to 'etc/rc.d')
| -rw-r--r-- | etc/rc.d/pf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/rc.d/pf b/etc/rc.d/pf index a4c4335..db1bf60 100644 --- a/etc/rc.d/pf +++ b/etc/rc.d/pf @@ -20,7 +20,7 @@ check_cmd="pf_check" reload_cmd="pf_reload" resync_cmd="pf_resync" status_cmd="pf_status" -extra_commands="check reload resync" +extra_commands="check reload resync status" required_files="$pf_rules" pf_prestart() |
