package/base-files: allow ipv6 routes without gateway specified

[openwrt.git] / package / base-files / files / etc / hotplug.d / iface / 10-routes

diff --git a/package/base-files/files/etc/hotplug.d/iface/10-routes b/package/base-files/files/etc/hotplug.d/iface/10-routes
index 7e957f7..dd6ae50 100644 (file)
--- a/package/base-files/files/etc/hotplug.d/iface/10-routes
+++ b/package/base-files/files/etc/hotplug.d/iface/10-routes
@@ -20,8 +20,7 @@ add_route() {
                return 1
        }
        [ -n "$gateway" ] || {
                return 1
        }
        [ -n "$gateway" ] || {

-               echo "Missing gateway in route section $config"
-               return 1
+               config_get gateway "$interface" gateway

        }
 
        netmask="${netmask:-255.255.255.255}"
        }
 
        netmask="${netmask:-255.255.255.255}"


@@ -52,18 +51,16 @@ add_route6() {
                return 1
        }
        [ -n "$gateway" ] || {
                return 1
        }
        [ -n "$gateway" ] || {

-               echo "Missing gateway in route section $config"
-               return 1
+               config_get gateway "$interface" gateway

        }
 
        }
 

-       /sbin/route -A inet6 add $target gw "$gateway" ${dev:+dev "$dev"} ${metric:+ metric "$metric"}
+       /sbin/route -A inet6 add $target ${gateway:+gw "$gateway"} ${dev:+dev "$dev"} ${metric:+ metric "$metric"}

 }
 
 case "$ACTION" in
        ifup)
                include /lib/network
                scan_interfaces
 }
 
 case "$ACTION" in
        ifup)
                include /lib/network
                scan_interfaces

-               . /var/state/network

                config_foreach "add_route" route
                config_foreach "add_route6" route6
        ;;
                config_foreach "add_route" route
                config_foreach "add_route6" route6
        ;;