status cleanup

[J. Hellenthal]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1



On Fri, 18 Mar 2011 21:31, wxs@ 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.
>>
>
> This time with the patch attached, or you can get it at:
>
> http://people.freebsd.org/~wxs/rc-status-cleanup.diff
>

While on this subject since it has to do with status messages I might as 
well take a moment and share the following patch [1] that changes the 
stupid "Enabling pfpf enabled" & "Disabling pfpf disabled" messages.

1. http://patches.jhell.googlecode.com/hg/pf-rc-startstop.patch


- -- 

  Regards,

  J. Hellenthal
  (0x89D8547E)
  JJH48-ARIN

-----BEGIN PGP SIGNATURE-----
Comment: THIS SOFTWARE AND/OR CONTENTS IS PROVIDED BY THE AUTHOR ``AS IS'' AND
Comment: ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
Comment: IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
Comment: PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
Comment: DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
Comment: DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
Comment: OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
Comment: HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
Comment: STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
Comment: IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
Comment: POSSIBILITY OF SUCH DAMAGE.

iQEcBAEBAgAGBQJNhXiYAAoJEJBXh4mJ2FR+CKAH/296rcCVoYDH3pUqwentnUHR
2T4ocIbJ+76/z/HgCl257sV3iWGhrQxPy/LbcEGPZ1JrxyhTtyfAPMO4uG8I95sO
R3mlA6fBtt5PVOexPuPRIIjmjK4zUBQimRreUCRDng+AyKxoi+/pIwAiaSBnUitD
PdCeHHNvotB4zffjc9Kq1KJol9hyhwpzMnHBPywQ8NKgt1mETNYUrdUbLBBjCdgP
KkDIlMy2/pzi6garrPdW02G8fV4co9jLha0zWZmVo2oOy7/iUrdnbT8URY5l7EfU
/fkQFPmTwTq9OGi5WBuvX581S0F2n6xlVjoP3hcEGeSSPNw1t+qMebLeUvveJXk=
=MiOn
-----END PGP SIGNATURE-----
-------------- next part --------------
# HG changeset patch
# Parent 7528376bbc7bdeae642e31cba2bdb3e52930c64b
Fixup pf start/stop messages on the console, Enabling pfpf enabled

diff -r 7528376bbc7b etc/rc.d/pf
--- a/etc/rc.d/pf
+++ b/etc/rc.d/pf
@@ -25,7 +25,7 @@
 
 pf_start()
 {
-	check_startmsgs && echo -n 'Enabling pf'
+	check_startmsgs && echo -n 'Enabling pf: '
 	$pf_program -F all > /dev/null 2>&1
 	$pf_program -f "$pf_rules" $pf_flags
 	if ! $pf_program -s info | grep -q "Enabled" ; then
@@ -37,7 +37,7 @@
 pf_stop()
 {
 	if $pf_program -s info | grep -q "Enabled" ; then
-		echo -n 'Disabling pf'
+		echo -n 'Disabling pf: '
 		$pf_program -d
 		echo '.'
 	fi