Author: baggins
Date: Mon Mar 21 23:15:00 2011
New Revision: 12211
Modified:
rc-scripts/trunk/doc/sysconfig.docb
rc-scripts/trunk/doc/sysconfig.txt
rc-scripts/trunk/sysconfig/Makefile.am
rc-scripts/trunk/sysconfig/network-scripts/functions.network
rc-scripts/trunk/sysconfig/network-scripts/ifup-routes
Log:
- add static-routes6 support (IPv6-only ip routes and rules)
Modified: rc-scripts/trunk/doc/sysconfig.docb
==============================================================================
--- rc-scripts/trunk/doc/sysconfig.docb (original)
+++ rc-scripts/trunk/doc/sysconfig.docb Mon Mar 21 23:15:00 2011
@@ -163,6 +163,12 @@
</refsect1>
<refsect1>
+ <title><filename>/etc/sysconfig/static-routes6</filename></title>
+ <para>Same as <filename>/etc/sysconfig/static-routes</filename> but
+ for IPv6.</para>
+ </refsect1>
+
+ <refsect1>
<title><filename>/etc/sysconfig/routed</filename></title>
<simplelist>
<member>SILENT=yes|no</member>
Modified: rc-scripts/trunk/doc/sysconfig.txt
==============================================================================
--- rc-scripts/trunk/doc/sysconfig.txt (original)
+++ rc-scripts/trunk/doc/sysconfig.txt Mon Mar 21 23:15:00 2011
@@ -61,7 +61,7 @@
<device> may be a device name to have the route brought up and
down with the device, or "any" to have the correct devices calculated
- at run time. [type] is optional. RH style isn't supported !
+ at run time. [type] is optional. RH style isn't supported!
Also you can set few options after "<gateway>":
tos <tos>
@@ -77,7 +77,11 @@
protocol <rtproto>
onlink
equalize
- For more informations see iproute2 documentation .
+ For more informations see iproute2 documentation.
+
+/etc/sysconfig/static-routes6:
+
+ Same as /etc/sysconfig/static-routes but for IPv6.
/etc/sysconfig/routed:
Modified: rc-scripts/trunk/sysconfig/Makefile.am
==============================================================================
--- rc-scripts/trunk/sysconfig/Makefile.am (original)
+++ rc-scripts/trunk/sysconfig/Makefile.am Mon Mar 21 23:15:00 2011
@@ -10,6 +10,7 @@
system \
network \
static-routes \
+ static-routes6 \
static-nat \
static-arp \
i18n
Modified: rc-scripts/trunk/sysconfig/network-scripts/functions.network
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/functions.network
(original)
+++ rc-scripts/trunk/sysconfig/network-scripts/functions.network Mon Mar
21 23:15:00 2011
@@ -327,6 +327,18 @@
done
fi
fi
+ is_no "$IPV6_NETWORKING" && return
+ if [ -f /etc/sysconfig/static-routes6 ]; then
+ if [ "$1" = "on" -o "$1" = "yes" ]; then
+ grep -E "^(none|any)[[:blank:]]"
/etc/sysconfig/static-routes6 | while read device args; do
+ /sbin/ip -6 route add $args
+ done
+ else
+ grep -E "^(none|any)[[:blank:]]"
/etc/sysconfig/static-routes6 | while read device args; do
+ /sbin/ip -6 route del $args 2>/dev/null
+ done
+ fi
+ fi
}
# Add ONLY IPv4 address (IPv6 address is added automaticly)
@@ -344,6 +356,10 @@
fi
/sbin/ip route add $args dev lo
done
+ is_no "$IPV6_NETWORKING" && return
+ grep -E "^(lo|any)[[:blank:]]" /etc/sysconfig/static-routes6 | while
read device args; do
+ /sbin/ip -6 route add $args dev lo
+ done
}
set_down_loopback()
@@ -460,7 +476,19 @@
done
elif is_no "$1"; then
LC_ALL=C /sbin/ip rule show | grep -vE -e "from all
lookup (main|default|local) \$" -e " map-to " | while read prio from src args;
do
- [ "$src" = "all" ] && ip rule delete $args ||
ip rule delete $from $src $args
+ [ "$src" = "all" ] && /sbin/ip rule delete
$args || /sbin/ip rule delete $from $src $args
+ done
+ fi
+ fi
+ is_no "$IPV6_NETWORKING" && return
+ if [ -f /etc/sysconfig/static-routes6 ]; then
+ if is_yes "$1"; then
+ grep -E
"^(from|to|iif|tos|fwmark|dev|pref|priority|prio)[[:blank:]]"
/etc/sysconfig/static-routes6 | while read args; do
+ /sbin/ip -6 rule add $args
+ done
+ elif is_no "$1"; then
+ LC_ALL=C /sbin/ip -6 rule show | grep -vE -e "from all
lookup (main|default|local) \$" -e " map-to " | while read prio from src args;
do
+ [ "$src" = "all" ] && /sbin/ip -6 rule delete
$args || /sbin/ip -6 rule delete $from $src $args
done
fi
fi
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup-routes
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-routes (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup-routes Mon Mar 21
23:15:00 2011
@@ -5,7 +5,7 @@
# Adds static routes which go through device $DEVICE
# Called from ifup-post.
-if [ ! -f /etc/sysconfig/static-routes ]; then
+if [ ! -f /etc/sysconfig/static-routes -a ! -f /etc/sysconfig/static-routes6
]; then
return
fi
@@ -23,6 +23,11 @@
/sbin/ip route add $args dev $REALDEVICE
done
+if ! is_no "$IPV6_NETWORKING"; then
+ grep -E "^($DEVICE|any)[[:blank:]]" /etc/sysconfig/static-routes6 |
while read device args; do
+ /sbin/ip -6 route add $args dev $REALDEVICE
+ done
+fi
# based on information from http://avahi.org/wiki/AvahiAutoipd#Routes
if is_yes "$ZEROCONF" && ! /sbin/ip link show dev $REALDEVICE | grep -q
POINTOPOINT ; then
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
