d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Silence sysctl in startup scripts.

Browse Source 
This makes 'stop' behave consistently with 'start' in the script.
Also use $SYSCTL instead of sysctl for consistency within that script.

MFC after:	3 weeks
This commit is contained in:
Nick Hibma 2017-05-03 08:10:03 +00:00
parent 75a790cc57
commit c32d0b5689
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etc/rc.d/ipfw
View File

@ -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

2
etc/rc.d/routing
View File

@ -281,7 +281,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
}
ropts_init()