Allow specifying static IPv6 gateways (#2710)

[openwrt-10.03/.git] / package / base-files / files / lib / network / config.sh

diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index f07d92623f2972125371e6b1ff4b81679f879b9f..b8f350de844ffef2fdc0ebf3364fc4e225773105 100755 (executable)
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -146,16 +146,18 @@ setup_interface() {
                static)
                        config_get ipaddr "$config" ipaddr
                        config_get netmask "$config" netmask
-                       [ -z "$ipaddr" -o -z "$netmask" ] && return 1
-                       
                        config_get ip6addr "$config" ip6addr
+                       [ -z "$ipaddr" -o -z "$netmask" ] && [ -z "$ip6addr" ] && return 1
+                       
                        config_get gateway "$config" gateway
+                       config_get ip6gw "$config" ip6gw
                        config_get dns "$config" dns
                        config_get bcast "$config" broadcast
                        
                        [ -z "$ipaddr" ] || $DEBUG ifconfig "$iface" "$ipaddr" netmask "$netmask" broadcast "${bcast:-+}"
                        [ -z "$ip6addr" ] || $DEBUG ifconfig "$iface" add "$ip6addr"
                        [ -z "$gateway" ] || $DEBUG route add default gw "$gateway"
+                       [ -z "$ip6gw" ] || $DEBUG route -A inet6 add default gw "$ip6gw"
                        [ -z "$dns" ] || {
                                for ns in $dns; do
                                        grep "$ns" /tmp/resolv.conf.auto 2>/dev/null >/dev/null || {