From c066eb08513033430db1536cacff147738de4a24 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 31 Jul 2009 18:31:37 -0400
Subject: More ipv6_exec_sysctl removals.

---
 sysconfig/network-scripts/ifdown-ipv6      |  6 +++---
 sysconfig/network-scripts/ifup-ipv6        | 10 +++++-----
 sysconfig/network-scripts/init.ipv6-global | 12 ++++++------
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifdown-ipv6 b/sysconfig/network-scripts/ifdown-ipv6
index c6674ca7..e174ec90 100755
--- a/sysconfig/network-scripts/ifdown-ipv6
+++ b/sysconfig/network-scripts/ifdown-ipv6
@@ -64,9 +64,9 @@ if [ $? != 0 -a $? != 11 ]; then
 fi
 
 # Switch some sysctls to secure mode
-ipv6_exec_sysctl -w net.ipv6.conf.$DEVICE.forwarding=0 >/dev/null 2>&1
-ipv6_exec_sysctl -w net.ipv6.conf.$DEVICE.accept_ra=0 >/dev/null 2>&1
-ipv6_exec_sysctl -w net.ipv6.conf.$DEVICE.accept_redirects=0 >/dev/null 2>&1
+/sbin/sysctl -e -w net.ipv6.conf.$DEVICE.forwarding=0 >/dev/null 2>&1
+/sbin/sysctl -e -w net.ipv6.conf.$DEVICE.accept_ra=0 >/dev/null 2>&1
+/sbin/sysctl -e -w net.ipv6.conf.$DEVICE.accept_redirects=0 >/dev/null 2>&1
 
 # Test status of tun6to4 device
 ipv6_test_device_status tun6to4
diff --git a/sysconfig/network-scripts/ifup-ipv6 b/sysconfig/network-scripts/ifup-ipv6
index ff14b6dd..6f8008c0 100755
--- a/sysconfig/network-scripts/ifup-ipv6
+++ b/sysconfig/network-scripts/ifup-ipv6
@@ -89,7 +89,7 @@ if [ -n "$IPV6ADDR" ]; then
 fi
 
 # Get current global IPv6 forwarding
-ipv6_global_forwarding_current="$(ipv6_exec_sysctl -n net.ipv6.conf.all.forwarding)"
+ipv6_global_forwarding_current="$(/sbin/sysctl -e -n net.ipv6.conf.all.forwarding)"
 
 # Set some proc switches depending on defines
 if [ "$IPV6FORWARDING" = "yes" ]; then
@@ -124,9 +124,9 @@ else
 		ipv6_local_auto=0
 	fi
 fi
-ipv6_exec_sysctl -w net.ipv6.conf.$DEVICE.forwarding=$ipv6_local_forwarding >/dev/null 2>&1
-ipv6_exec_sysctl -w net.ipv6.conf.$DEVICE.accept_ra=$ipv6_local_auto >/dev/null 2>&1
-ipv6_exec_sysctl -w net.ipv6.conf.$DEVICE.accept_redirects=$ipv6_local_auto >/dev/null 2>&1
+/sbin/sysctl -e -w net.ipv6.conf.$DEVICE.forwarding=$ipv6_local_forwarding >/dev/null 2>&1
+/sbin/sysctl -e -w net.ipv6.conf.$DEVICE.accept_ra=$ipv6_local_auto >/dev/null 2>&1
+/sbin/sysctl -e -w net.ipv6.conf.$DEVICE.accept_redirects=$ipv6_local_auto >/dev/null 2>&1
 
 # Set IPv6 MTU, if given
 if [ -n "$IPV6_MTU" ]; then
@@ -142,7 +142,7 @@ fi
 
 # Enable IPv6 RFC3041 privacy extensions if desired
 if [ "$IPV6_PRIVACY" = "rfc3041" ]; then
-	ipv6_exec_sysctl -w net.ipv6.conf.$DEVICE.use_tempaddr=2 >/dev/null 2>&1
+	/sbin/sysctl -e -w net.ipv6.conf.$DEVICE.use_tempaddr=2 >/dev/null 2>&1
 	if [ $? -ne 0 ]; then
 		echo $"Cannot enable IPv6 privacy method '$IPV6_PRIVACY', not supported by kernel"
 	fi
diff --git a/sysconfig/network-scripts/init.ipv6-global b/sysconfig/network-scripts/init.ipv6-global
index 40dcdc27..2a5c3dff 100755
--- a/sysconfig/network-scripts/init.ipv6-global
+++ b/sysconfig/network-scripts/init.ipv6-global
@@ -67,11 +67,11 @@ case $ACTION in
 		for i in /proc/sys/net/ipv6/conf/* ; do
 			interface=${i##*/}
 			# Host/Router behaviour for the interface
-			ipv6_exec_sysctl -w net.ipv6.conf.$interface.forwarding=$ipv6_global_forwarding >/dev/null 2>&1
+			/sbin/sysctl -e -w net.ipv6.conf.$interface.forwarding=$ipv6_global_forwarding >/dev/null 2>&1
 
 			# Autoconfiguration and redirect handling for Hosts
-			ipv6_exec_sysctl -w net.ipv6.conf.$interface.accept_ra=$ipv6_global_auto >/dev/null 2>&1
-			ipv6_exec_sysctl -w net.ipv6.conf.$interface.accept_redirects=$ipv6_global_auto >/dev/null 2>&1
+			/sbin/sysctl -e -w net.ipv6.conf.$interface.accept_ra=$ipv6_global_auto >/dev/null 2>&1
+			/sbin/sysctl -e -w net.ipv6.conf.$interface.accept_redirects=$ipv6_global_auto >/dev/null 2>&1
 		done
 		;;
 
@@ -137,11 +137,11 @@ case $ACTION in
 		for i in /proc/sys/net/ipv6/conf/* ; do
 			interface=${i##*/}
 			# Assume Host behaviour
-			ipv6_exec_sysctl -w net.ipv6.conf.$interface.forwarding=0 >/dev/null 2>&1
+			/sbin/sysctl -e -w net.ipv6.conf.$interface.forwarding=0 >/dev/null 2>&1
 
 			# Disable autoconfiguration and redirects
-			ipv6_exec_sysctl -w net.ipv6.conf.$interface.accept_ra=0 >/dev/null 2>&1
-			ipv6_exec_sysctl -w net.ipv6.conf.$interface.accept_redirects=0 >/dev/null 2>&1
+			/sbin/sysctl -e -w net.ipv6.conf.$interface.accept_ra=0 >/dev/null 2>&1
+			/sbin/sysctl -e -w net.ipv6.conf.$interface.accept_redirects=0 >/dev/null 2>&1
 		done
 
 		# Cleanup still existing tunnel devices
-- 
cgit v1.2.1