diff options
| author | Lukas Nykryn <lnykryn@redhat.com> | 2012-08-07 14:28:13 +0200 |
|---|---|---|
| committer | Lukas Nykryn <lnykryn@redhat.com> | 2013-07-15 14:17:23 +0200 |
| commit | 7cb1b50573c4d8ebc62b08115616a64f1d273e7a (patch) | |
| tree | c42740e7775d9c0cbbd84f19518e1e836305a861 | |
| parent | 355815c2d706425da85d4a8312025baeecbcfaae (diff) | |
| download | initscripts-7cb1b50573c4d8ebc62b08115616a64f1d273e7a.tar initscripts-7cb1b50573c4d8ebc62b08115616a64f1d273e7a.tar.gz initscripts-7cb1b50573c4d8ebc62b08115616a64f1d273e7a.tar.bz2 initscripts-7cb1b50573c4d8ebc62b08115616a64f1d273e7a.tar.xz initscripts-7cb1b50573c4d8ebc62b08115616a64f1d273e7a.zip | |
Process rule6-* for sit devices (#840009)
Conflicts:
sysconfig/network-scripts/ifup-sit
| -rwxr-xr-x | sysconfig/network-scripts/ifdown-sit | 3 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-sit | 8 |
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} |