From d463b24eb479b3aeb5dc51479610fe3decf4ddd5 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 22 Oct 2010 13:05:06 -0400
Subject: Don't use the /sbin/ip wrapper that was removed in mid-2009.

---
 ppp/ip-up.ipv6to4 | 4 ++--
 ppp/ipv6-up       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ppp/ip-up.ipv6to4 b/ppp/ip-up.ipv6to4
index aae35f2c..b2f6e6e6 100644
--- a/ppp/ip-up.ipv6to4
+++ b/ppp/ip-up.ipv6to4
@@ -112,7 +112,7 @@ if [ "$IPV6TO4INIT" = "yes" ]; then
 		ipv6_cleanup_6to4_tunnels tun6to4
 
 		# Get MTU of master device
-		ipv4mtu="$(ipv6_exec_ip link show dev $DEVICE | grep -w "mtu" | awk '{ print $5 }')"
+		ipv4mtu="$(/sbin/ip link show dev $DEVICE | grep -w "mtu" | awk '{ print $5 }')"
 		if [ -n "$ipv4mtu" ]; then
 			# IPv6 tunnel MTU is IPv4 MTU minus 20 for IPv4 header
 			tunnelmtu=$[ $ipv4mtu - 20 ]
@@ -160,7 +160,7 @@ if [ "$IPV6TO4INIT" = "yes" ]; then
 					# Add gateway if missing
 					line="$line via $ipv6to4_relay"
 				fi
-				ipv6_exec_ip -6 route add $line
+				/sbin/ip -6 route add $line
 			done
                 fi
 
diff --git a/ppp/ipv6-up b/ppp/ipv6-up
index 92588b98..06062cfa 100644
--- a/ppp/ipv6-up
+++ b/ppp/ipv6-up
@@ -98,7 +98,7 @@ fi
 # Setup additional static IPv6 routes (newer config style)
 if [ -f "/etc/sysconfig/network-scripts/route6-$DEVICE" ]; then
 	cat "/etc/sysconfig/network-scripts/route6-$DEVICE" | sed 's/#.*//g' | grep -v '^[[:space:]]*$' | while read line; do
-		ipv6_exec_ip -6 route add $line
+		/sbin/ip -6 route add $line
 	done
 fi
 
-- 
cgit v1.2.1