status cleanup

[Wesley Shields]

On Fri, Mar 18, 2011 at 09:31:55PM -0400, Wesley Shields wrote:
> On Fri, Mar 18, 2011 at 09:29:59PM -0400, Wesley Shields wrote:
> > A co-worker noticed that the pf rc script has 'status' listed twice when
> > run without any arguments. The attached patch fixes that and two other
> > cases where this also happens. I've only tested the pf changes. I'd
> > appreciate a review of this and maybe a commit? I can file a PR if it
> > would make people feel better.
> > 
> > I'm not subscribed to this list so I would appreciate being CC'ed on any
> > replies.
> > 
> > -- WXS
> 
> This time with the patch attached, or you can get it at:
> 
> http://people.freebsd.org/~wxs/rc-status-cleanup.diff
> 
> -- WXS

Does anyone have any comments on this before I go finding someone with a
src bit to commit it?

-- WXS

> Index: etc/rc.d/ip6addrctl
> ===================================================================
> --- etc/rc.d/ip6addrctl	(revision 219454)
> +++ etc/rc.d/ip6addrctl	(working copy)
> @@ -15,7 +15,7 @@
>  rcvar=`set_rcvar`
>  start_cmd="ip6addrctl_start"
>  stop_cmd="ip6addrctl_stop"
> -extra_commands="status prefer_ipv6 prefer_ipv4"
> +extra_commands="prefer_ipv6 prefer_ipv4"
>  status_cmd="ip6addrctl"
>  prefer_ipv6_cmd="ip6addrctl_prefer_ipv6"
>  prefer_ipv4_cmd="ip6addrctl_prefer_ipv4"
> Index: etc/rc.d/ipfilter
> ===================================================================
> --- etc/rc.d/ipfilter	(revision 219454)
> +++ etc/rc.d/ipfilter	(working copy)
> @@ -23,7 +23,7 @@
>  resync_cmd="ipfilter_resync"
>  status_precmd="$stop_precmd"
>  status_cmd="ipfilter_status"
> -extra_commands="reload resync status"
> +extra_commands="reload resync"
>  required_modules="ipl:ipfilter"
>  
>  ipfilter_start()
> Index: etc/rc.d/pf
> ===================================================================
> --- etc/rc.d/pf	(revision 219454)
> +++ etc/rc.d/pf	(working copy)
> @@ -19,7 +19,7 @@
>  reload_cmd="pf_reload"
>  resync_cmd="pf_resync"
>  status_cmd="pf_status"
> -extra_commands="check reload resync status"
> +extra_commands="check reload resync"
>  required_files="$pf_rules"
>  required_modules="pf"
>