diff options
| author | emaste <emaste@FreeBSD.org> | 2011-03-30 01:19:00 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2011-03-30 01:19:00 +0000 |
| commit | 47909b5bffde5646bc91092a047f79d1b5bf2bbd (patch) | |
| tree | f237a9e5d6ed49257c45f87919451376fa0b54a8 /etc/rc.d/netoptions | |
| parent | a9eba0596c4e413de61c0d0960d01c83a16b0feb (diff) | |
| download | FreeBSD-src-47909b5bffde5646bc91092a047f79d1b5bf2bbd.zip FreeBSD-src-47909b5bffde5646bc91092a047f79d1b5bf2bbd.tar.gz | |
Replace ${SYSCTL_W} with ${SYSCTL} in rc.d scripts, as they are identical.
This is a further clean up after r202988.
SYSCTL_W is still initialized in rc.subr as some ports may still use it.
Diffstat (limited to 'etc/rc.d/netoptions')
| -rwxr-xr-x | etc/rc.d/netoptions | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index 433ce82..09ed6ef 100755 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -40,44 +40,44 @@ netoptions_inet() [12]) netoptions_init echo -n " log_in_vain=${log_in_vain}" - ${SYSCTL_W} net.inet.tcp.log_in_vain=${log_in_vain} >/dev/null - ${SYSCTL_W} net.inet.udp.log_in_vain=${log_in_vain} >/dev/null + ${SYSCTL} net.inet.tcp.log_in_vain=${log_in_vain} >/dev/null + ${SYSCTL} net.inet.udp.log_in_vain=${log_in_vain} >/dev/null ;; *) - ${SYSCTL_W} net.inet.tcp.log_in_vain=0 >/dev/null - ${SYSCTL_W} net.inet.udp.log_in_vain=0 >/dev/null + ${SYSCTL} net.inet.tcp.log_in_vain=0 >/dev/null + ${SYSCTL} net.inet.udp.log_in_vain=0 >/dev/null ;; esac if checkyesno tcp_extensions; then - ${SYSCTL_W} net.inet.tcp.rfc1323=1 >/dev/null + ${SYSCTL} net.inet.tcp.rfc1323=1 >/dev/null else netoptions_init echo -n " rfc1323 extensions=${tcp_extensions}" - ${SYSCTL_W} net.inet.tcp.rfc1323=0 >/dev/null + ${SYSCTL} net.inet.tcp.rfc1323=0 >/dev/null fi if checkyesno tcp_keepalive; then - ${SYSCTL_W} net.inet.tcp.always_keepalive=1 >/dev/null + ${SYSCTL} net.inet.tcp.always_keepalive=1 >/dev/null else netoptions_init echo -n " TCP keepalive=${tcp_keepalive}" - ${SYSCTL_W} net.inet.tcp.always_keepalive=0 >/dev/null + ${SYSCTL} net.inet.tcp.always_keepalive=0 >/dev/null fi if checkyesno tcp_drop_synfin; then netoptions_init echo -n " drop SYN+FIN packets=${tcp_drop_synfin}" - ${SYSCTL_W} net.inet.tcp.drop_synfin=1 >/dev/null + ${SYSCTL} net.inet.tcp.drop_synfin=1 >/dev/null else - ${SYSCTL_W} net.inet.tcp.drop_synfin=0 >/dev/null + ${SYSCTL} net.inet.tcp.drop_synfin=0 >/dev/null fi case ${ip_portrange_first} in [0-9]*) netoptions_init echo -n " ip_portrange_first=$ip_portrange_first" - ${SYSCTL_W} net.inet.ip.portrange.first=$ip_portrange_first >/dev/null + ${SYSCTL} net.inet.ip.portrange.first=$ip_portrange_first >/dev/null ;; esac @@ -85,7 +85,7 @@ netoptions_inet() [0-9]*) netoptions_init echo -n " ip_portrange_last=$ip_portrange_last" - ${SYSCTL_W} net.inet.ip.portrange.last=$ip_portrange_last >/dev/null + ${SYSCTL} net.inet.ip.portrange.last=$ip_portrange_last >/dev/null ;; esac } @@ -95,16 +95,16 @@ netoptions_inet6() if checkyesno ipv6_ipv4mapping; then netoptions_init echo -n " ipv4-mapped-ipv6=${ipv6_ipv4mapping}" - ${SYSCTL_W} net.inet6.ip6.v6only=0 >/dev/null + ${SYSCTL} net.inet6.ip6.v6only=0 >/dev/null else - ${SYSCTL_W} net.inet6.ip6.v6only=1 >/dev/null + ${SYSCTL} net.inet6.ip6.v6only=1 >/dev/null fi if checkyesno ipv6_privacy; then netoptions_init echo -n " IPv6 Privacy Addresses" - ${SYSCTL_W} net.inet6.ip6.use_tempaddr=1 >/dev/null - ${SYSCTL_W} net.inet6.ip6.prefer_tempaddr=1 >/dev/null + ${SYSCTL} net.inet6.ip6.use_tempaddr=1 >/dev/null + ${SYSCTL} net.inet6.ip6.prefer_tempaddr=1 >/dev/null fi } |
