summaryrefslogtreecommitdiffstats
path: root/etc/rc.d/pf
diff options
context:
space:
mode:
authordougb <dougb@FreeBSD.org>2009-10-10 22:17:03 +0000
committerdougb <dougb@FreeBSD.org>2009-10-10 22:17:03 +0000
commit1eae783464889ce2c3e196e469e50fbc82f1a017 (patch)
treef49c4e3cc88efec4813ca1f389f8f77eca5d2ba0 /etc/rc.d/pf
parent2c9565c3a66667195e5ea0136795c947f511fbfc (diff)
downloadFreeBSD-src-1eae783464889ce2c3e196e469e50fbc82f1a017.zip
FreeBSD-src-1eae783464889ce2c3e196e469e50fbc82f1a017.tar.gz
In regards to the "Starting foo:" type messages at boot time, create and
employ a more generic solution, and use it in the individual rc.d scripts that also have an $rc_quiet test: 1. Add check_startmsgs() to rc.subr. 2. In the rc.d scripts that use rc_quiet (and rc.subr) substitute variations of [ -z "$rc_quiet" ] with check_startmsgs 3. In savecore add a trailing '.' to the end of the message to make it more consistent with other scripts. 4. In newsyslog remove a : before the terminal '.' since we do not expect there to be anything printed out in between to make it more consistent. 5. In the following scripts change "quotes" to 'quotes' where no variables exist in the message: savecore pf newsyslog 6. In the following scripts substitute if/then/fi for the simpler (and more consistent) check_startmsgs &&: faith stf 7. In the following scripts separate the "Starting foo:" from the terminal '.' to make them more consistent: moused hostname pf 8. In nfsclient move the message to its own line to avoid a style bug 9. In pf rc_quiet does not apply to the _stop method, so remove the test there. 10. In motd add 'quotes' around the terminal '.' for consistency
Diffstat (limited to 'etc/rc.d/pf')
-rwxr-xr-xetc/rc.d/pf6
1 files changed, 4 insertions, 2 deletions
diff --git a/etc/rc.d/pf b/etc/rc.d/pf
index f1044a3..9f64c04 100755
--- a/etc/rc.d/pf
+++ b/etc/rc.d/pf
@@ -25,19 +25,21 @@ required_modules="pf"
pf_start()
{
- [ -z "${rc_quiet}" ] && echo "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
$pf_program -e
fi
+ check_startmsgs && echo '.'
}
pf_stop()
{
if $pf_program -s info | grep -q "Enabled" ; then
- [ -z "${rc_quiet}" ] && echo "Disabling pf."
+ echo -n 'Disabling pf'
$pf_program -d
+ echo '.'
fi
}
OpenPOWER on IntegriCloud