diff options
| author | n_hibma <n_hibma@FreeBSD.org> | 2017-05-26 19:19:47 +0000 |
|---|---|---|
| committer | n_hibma <n_hibma@FreeBSD.org> | 2017-05-26 19:19:47 +0000 |
| commit | 00dd79dca11b485dc123fff8114b0a0fc2c1043d (patch) | |
| tree | 8aca3253d1990793c2ac1a08acf5ede258116615 | |
| parent | fd30a6e2c972b4f9a9d61de5be7377caf9eba740 (diff) | |
| download | FreeBSD-src-00dd79dca11b485dc123fff8114b0a0fc2c1043d.zip FreeBSD-src-00dd79dca11b485dc123fff8114b0a0fc2c1043d.tar.gz | |
MFC 317729:
Silence sysctl in startup scripts.
This makes 'stop' behave consistently with 'start' in the script.
Also use $SYSCTL instead of sysctl for consistency within that script.
| -rwxr-xr-x | etc/rc.d/ipfw | 10 | ||||
| -rwxr-xr-x | etc/rc.d/routing | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/etc/rc.d/ipfw b/etc/rc.d/ipfw index beccaff..deb9bda 100755 --- a/etc/rc.d/ipfw +++ b/etc/rc.d/ipfw @@ -56,7 +56,7 @@ ipfw_start() # if checkyesno firewall_logging; then echo 'Firewall logging enabled.' - sysctl net.inet.ip.fw.verbose=1 >/dev/null + ${SYSCTL} net.inet.ip.fw.verbose=1 >/dev/null fi if checkyesno firewall_logif; then ifconfig ipfw0 create @@ -78,11 +78,11 @@ ipfw_poststart() # Enable the firewall # - if ! ${SYSCTL} net.inet.ip.fw.enable=1 1>/dev/null 2>&1; then + if ! ${SYSCTL} net.inet.ip.fw.enable=1 >/dev/null 2>&1; then warn "failed to enable IPv4 firewall" fi if afexists inet6; then - if ! ${SYSCTL} net.inet6.ip6.fw.enable=1 1>/dev/null 2>&1 + if ! ${SYSCTL} net.inet6.ip6.fw.enable=1 >/dev/null 2>&1 then warn "failed to enable IPv6 firewall" fi @@ -95,9 +95,9 @@ ipfw_stop() # Disable the firewall # - ${SYSCTL} net.inet.ip.fw.enable=0 + ${SYSCTL} net.inet.ip.fw.enable=0 >/dev/null if afexists inet6; then - ${SYSCTL} net.inet6.ip6.fw.enable=0 + ${SYSCTL} net.inet6.ip6.fw.enable=0 >/dev/null fi # Stop firewall coscripts diff --git a/etc/rc.d/routing b/etc/rc.d/routing index 2a57fa3..4d3c964 100755 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -286,7 +286,7 @@ static_inet6() esac ifconfig ${ipv6_default_interface} inet6 defaultif - sysctl net.inet6.ip6.use_defaultzone=1 + ${SYSCTL} net.inet6.ip6.use_defaultzone=1 > /dev/null } static_atm() |
