aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2010-10-22 13:05:06 -0400
committerBill Nottingham <notting@redhat.com>2010-10-22 13:05:35 -0400
commit9d2e2d459038a25477dacde8239f646e935862bd (patch)
treefaa3f3f555a439271ccd5e0c2f3bd037ce0e14e9
parentf188afc636e09215ca3c120e7fb082a6132148fb (diff)
downloadinitscripts-9d2e2d459038a25477dacde8239f646e935862bd.tar
initscripts-9d2e2d459038a25477dacde8239f646e935862bd.tar.gz
initscripts-9d2e2d459038a25477dacde8239f646e935862bd.tar.bz2
initscripts-9d2e2d459038a25477dacde8239f646e935862bd.tar.xz
initscripts-9d2e2d459038a25477dacde8239f646e935862bd.zip
Don't use the /sbin/ip wrapper that was removed in mid-2009.
-rw-r--r--ppp/ip-up.ipv6to44
-rw-r--r--ppp/ipv6-up2
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