aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig/network-scripts
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:37:57 +0200
commitd232acc90d7ebc2beba5e4ef6f9ffa6ab7f9b795 (patch)
tree09b1b49ce5e420a89ea3d29f65d0ee792285673a /sysconfig/network-scripts
parent9303515da29993a52ad373cc739a776d66fe90ce (diff)
downloadinitscripts-d232acc90d7ebc2beba5e4ef6f9ffa6ab7f9b795.tar
initscripts-d232acc90d7ebc2beba5e4ef6f9ffa6ab7f9b795.tar.gz
initscripts-d232acc90d7ebc2beba5e4ef6f9ffa6ab7f9b795.tar.bz2
initscripts-d232acc90d7ebc2beba5e4ef6f9ffa6ab7f9b795.tar.xz
initscripts-d232acc90d7ebc2beba5e4ef6f9ffa6ab7f9b795.zip
Process rule6-* for sit devices (#840009)
Diffstat (limited to 'sysconfig/network-scripts')
-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 39e9c50f..e4d07345 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 498305b7..eb77fc4d 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
- sed -ne 's/#.*//' -e '/[^[:space:]]/p' "/etc/sysconfig/network-scripts/route6-$REALDEVICE" | while read line; do
- /sbin/ip -6 route add $line
- done
-fi
+# Setup static routes
+/etc/sysconfig/network-scripts/ifup-routes ${REALDEVICE}