diff options
author | dougb <dougb@FreeBSD.org> | 2009-10-10 22:17:03 +0000 |
---|---|---|
committer | dougb <dougb@FreeBSD.org> | 2009-10-10 22:17:03 +0000 |
commit | 1eae783464889ce2c3e196e469e50fbc82f1a017 (patch) | |
tree | f49c4e3cc88efec4813ca1f389f8f77eca5d2ba0 /etc/rc.d/stf | |
parent | 2c9565c3a66667195e5ea0136795c947f511fbfc (diff) | |
download | FreeBSD-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/stf')
-rwxr-xr-x | etc/rc.d/stf | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/etc/rc.d/stf b/etc/rc.d/stf index 40b182a..6f7347b 100755 --- a/etc/rc.d/stf +++ b/etc/rc.d/stf @@ -53,9 +53,8 @@ stf_up() ifconfig stf0 create >/dev/null 2>&1 ifconfig stf0 inet6 2002:${ipv4_in_hexformat}:${stf_interface_ipv6_slaid:-0}:${stf_interface_ipv6_ifid} \ prefixlen ${stf_prefixlen} - if [ -z "${rc_quiet}" ]; then - /sbin/ifconfig stf0 - fi + check_startmsgs && /sbin/ifconfig stf0 + # disallow packets to malicious 6to4 prefix route add -inet6 2002:e000:: -prefixlen 20 ::1 -reject route add -inet6 2002:7f00:: -prefixlen 24 ::1 -reject |