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.

1 files changed, 18 insertions, 18 deletions

diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index 30242fc..add1e0a 100755
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -264,57 +264,57 @@ options_inet()
 	if checkyesno icmp_bmcastecho; then
 		ropts_init
 		echo -n ' broadcast ping responses=YES'
-		${SYSCTL_W} net.inet.icmp.bmcastecho=1 > /dev/null
+		${SYSCTL} net.inet.icmp.bmcastecho=1 > /dev/null
 	else
-		${SYSCTL_W} net.inet.icmp.bmcastecho=0 > /dev/null
+		${SYSCTL} net.inet.icmp.bmcastecho=0 > /dev/null
 	fi
 
 	if checkyesno icmp_drop_redirect; then
 		ropts_init
 		echo -n ' ignore ICMP redirect=YES'
-		${SYSCTL_W} net.inet.icmp.drop_redirect=1 > /dev/null
+		${SYSCTL} net.inet.icmp.drop_redirect=1 > /dev/null
 	else
-		${SYSCTL_W} net.inet.icmp.drop_redirect=0 > /dev/null
+		${SYSCTL} net.inet.icmp.drop_redirect=0 > /dev/null
 	fi
 
 	if checkyesno icmp_log_redirect; then
 		ropts_init
 		echo -n ' log ICMP redirect=YES'
-		${SYSCTL_W} net.inet.icmp.log_redirect=1 > /dev/null
+		${SYSCTL} net.inet.icmp.log_redirect=1 > /dev/null
 	else
-		${SYSCTL_W} net.inet.icmp.log_redirect=0 > /dev/null
+		${SYSCTL} net.inet.icmp.log_redirect=0 > /dev/null
 	fi
 
 	if checkyesno gateway_enable; then
 		ropts_init
 		echo -n ' IPv4 gateway=YES'
-		${SYSCTL_W} net.inet.ip.forwarding=1 > /dev/null
+		${SYSCTL} net.inet.ip.forwarding=1 > /dev/null
 	else
-		${SYSCTL_W} net.inet.ip.forwarding=0 > /dev/null
+		${SYSCTL} net.inet.ip.forwarding=0 > /dev/null
 	fi
 
 	if checkyesno forward_sourceroute; then
 		ropts_init
 		echo -n ' do source routing=YES'
-		${SYSCTL_W} net.inet.ip.sourceroute=1 > /dev/null
+		${SYSCTL} net.inet.ip.sourceroute=1 > /dev/null
 	else
-		${SYSCTL_W} net.inet.ip.sourceroute=0 > /dev/null
+		${SYSCTL} net.inet.ip.sourceroute=0 > /dev/null
 	fi
 
 	if checkyesno accept_sourceroute; then
 		ropts_init
 		echo -n ' accept source routing=YES'
-		${SYSCTL_W} net.inet.ip.accept_sourceroute=1 > /dev/null
+		${SYSCTL} net.inet.ip.accept_sourceroute=1 > /dev/null
 	else
-		${SYSCTL_W} net.inet.ip.accept_sourceroute=0 > /dev/null
+		${SYSCTL} net.inet.ip.accept_sourceroute=0 > /dev/null
 	fi
 
 	if checkyesno arpproxy_all; then
 		ropts_init
 		echo -n ' ARP proxyall=YES'
-		${SYSCTL_W} net.link.ether.inet.proxyall=1 > /dev/null
+		${SYSCTL} net.link.ether.inet.proxyall=1 > /dev/null
 	else
-		${SYSCTL_W} net.link.ether.inet.proxyall=0 > /dev/null
+		${SYSCTL} net.link.ether.inet.proxyall=0 > /dev/null
 	fi
 }
 
@@ -323,9 +323,9 @@ options_inet6()
 	if checkyesno ipv6_gateway_enable; then
 		ropts_init
 		echo -n ' IPv6 gateway=YES'
-		${SYSCTL_W} net.inet6.ip6.forwarding=1 > /dev/null
+		${SYSCTL} net.inet6.ip6.forwarding=1 > /dev/null
 	else
-		${SYSCTL_W} net.inet6.ip6.forwarding=0 > /dev/null
+		${SYSCTL} net.inet6.ip6.forwarding=0 > /dev/null
 	fi
 }
 
@@ -338,9 +338,9 @@ options_ipx()
 	if checkyesno ipxgateway_enable; then
 		ropts_init
 		echo -n ' IPX gateway=YES'
-		${SYSCTL_W} net.ipx.ipx.ipxforwarding=1 > /dev/null
+		${SYSCTL} net.ipx.ipx.ipxforwarding=1 > /dev/null
 	else
-		${SYSCTL_W} net.ipx.ipx.ipxforwarding=0 > /dev/null
+		${SYSCTL} net.ipx.ipx.ipxforwarding=0 > /dev/null
 	fi
 }