aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig
diff options
context:
space:
mode:
authorLukas Nykryn <lnykryn@redhat.com>2012-08-07 14:28:13 +0200
committerLukas Nykryn <lnykryn@redhat.com>2012-08-07 14:28:13 +0200
commitf082f9e64eadbf68ef9bb67744c97c0974af9115 (patch)
tree4c5198e5b3b7a931cae314a6a1a8b9663fa7b586 /sysconfig
parent10c72ce532c1d4f6d0b17fdc9448c9bd2d0b5ef5 (diff)
downloadinitscripts-f082f9e64eadbf68ef9bb67744c97c0974af9115.tar
initscripts-f082f9e64eadbf68ef9bb67744c97c0974af9115.tar.gz
initscripts-f082f9e64eadbf68ef9bb67744c97c0974af9115.tar.bz2
initscripts-f082f9e64eadbf68ef9bb67744c97c0974af9115.tar.xz
initscripts-f082f9e64eadbf68ef9bb67744c97c0974af9115.zip
Process rule6-* for sit devices (#840009)
Diffstat (limited to 'sysconfig')
-rwxr-xr-xsysconfig/network-scripts/ifdown-sit3
-rwxr-xr-xsysconfig/network-scripts/ifup-sit8
2 files changed, 5 insertions, 6 deletions
diff --git a/sysconfig/network-scripts/ifdown-sit b/sysconfig/network-scripts/ifdown-sit
index 68b2002f..7d6951f2 100755
--- a/sysconfig/network-scripts/ifdown-sit
+++ b/sysconfig/network-scripts/ifdown-sit
@@ -51,5 +51,8 @@ if [ $? != 0 -a $? != 11 ]; then
exit 0
fi
+# Cleanup additional static routes
+/etc/sysconfig/network-scripts/ifdown-routes ${REALDEVICE}
+
# Cleanup and shut down IPv6-in-IPv4 tunnel device
ipv6_del_tunnel_device $DEVICE
diff --git a/sysconfig/network-scripts/ifup-sit b/sysconfig/network-scripts/ifup-sit
index 3b24985c..330118a8 100755
--- a/sysconfig/network-scripts/ifup-sit
+++ b/sysconfig/network-scripts/ifup-sit
@@ -104,9 +104,5 @@ if [ -f /etc/sysconfig/static-routes-ipv6 ]; then
done
fi
-# Setup additional static IPv6 routes (newer config style)
-if [ -f "/etc/sysconfig/network-scripts/route6-$REALDEVICE" ]; then
- cat "/etc/sysconfig/network-scripts/route6-$REALDEVICE" | sed 's/#.*//g' | grep -v '^[[:space:]]*$' | while read line; do
- /sbin/ip -6 route add $line
- done
-fi
+# Setup static routes
+/etc/sysconfig/network-scripts/ifup-routes ${REALDEVICE}