conf/158557: [patch] /etc/rc.d/pf broken messages

[Mark Linimon]

The following reply was made to PR conf/158557; it has been noted by GNATS.

From: Mark Linimon <linimon at lonesome.com>
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: conf/158557: [patch] /etc/rc.d/pf broken messages
Date: Fri, 1 Jul 2011 17:21:16 -0500

 ----- Forwarded message from David Demelier <demelier.david at gmail.com> -----
 
 --- pf.diff begins here ---
 --- /etc/rc.d/pf.orig	2011-07-01 10:33:45.000000000 +0200
 +++ /etc/rc.d/pf	2011-07-01 10:57:10.000000000 +0200
 @@ -29,17 +29,19 @@
  	$pf_program -F all > /dev/null 2>&1
  	$pf_program -f "$pf_rules" $pf_flags
  	if ! $pf_program -s info | grep -q "Enabled" ; then
 -		$pf_program -e
 +		msg=`$pf_program -e 2>&1`
 +		check_startmsgs && echo -n ": ${msg}" || echo -n "${msg}"
 +
  	fi
 -	check_startmsgs && echo '.'
 +	echo '.'
  }
 
  pf_stop()
  {
  	if $pf_program -s info | grep -q "Enabled" ; then
 -		echo -n 'Disabling pf'
 -		$pf_program -d
 -		echo '.'
 +		echo -n 'Disabling pf: '
 +		msg=`$pf_program -d 2>&1`
 +		echo "$msg."
  	fi
  }
 
 --- pf.diff ends here ---
 
 -- 
 David Demelier
 
 ----- End forwarded message -----