From 439f89ac76f92a161885034fabf60ff2b5ee49f4 Mon Sep 17 00:00:00 2001 From: rse Date: Thu, 10 Nov 2005 10:40:15 +0000 Subject: 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 ...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. --- etc/rc.d/pf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'etc/rc.d/pf') 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() -- cgit v1.1