From owner-freebsd-rc@FreeBSD.ORG  Tue Mar 29 02:43:55 2011
Return-Path: <owner-freebsd-rc@FreeBSD.ORG>
Delivered-To: freebsd-rc@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 38E661065670
	for <freebsd-rc@FreeBSD.org>; Tue, 29 Mar 2011 02:43:55 +0000 (UTC)
	(envelope-from wxs@atarininja.org)
Received: from syn.atarininja.org (syn.csh.rit.edu [129.21.49.45])
	by mx1.freebsd.org (Postfix) with ESMTP id 184298FC17
	for <freebsd-rc@FreeBSD.org>; Tue, 29 Mar 2011 02:43:55 +0000 (UTC)
Received: by syn.atarininja.org (Postfix, from userid 1001)
	id 6BE595C3A; Mon, 28 Mar 2011 22:44:41 -0400 (EDT)
Date: Mon, 28 Mar 2011 22:44:41 -0400
From: Wesley Shields <wxs@FreeBSD.org>
To: freebsd-rc@FreeBSD.org
Message-ID: <20110329024441.GA24720@atarininja.org>
References: <20110319012959.GA39929@atarininja.org>
	<20110319013155.GB39929@atarininja.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20110319013155.GB39929@atarininja.org>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: 
Subject: Re: status cleanup
X-BeenThere: freebsd-rc@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "Discussion related to /etc/rc.d design and implementation."
	<freebsd-rc.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-rc>,
	<mailto:freebsd-rc-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-rc>
List-Post: <mailto:freebsd-rc@freebsd.org>
List-Help: <mailto:freebsd-rc-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-rc>,
	<mailto:freebsd-rc-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Mar 2011 02:43:55 -0000

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"
>