From 79cdadea60cd27e9c68b907bcf83a13541fb6f04 Mon Sep 17 00:00:00 2001 From: jow Date: Fri, 29 Jun 2012 11:58:35 +0000 Subject: [package] base-files: only consider enabled default routes when finding the wan iface (#11774) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32525 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/lib/functions/network.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'package/base-files/files/lib/functions') diff --git a/package/base-files/files/lib/functions/network.sh b/package/base-files/files/lib/functions/network.sh index 7475b00cba..c6b98e6e1c 100644 --- a/package/base-files/files/lib/functions/network.sh +++ b/package/base-files/files/lib/functions/network.sh @@ -49,6 +49,7 @@ __network_gateway() local __tmp="$(ubus call network.interface."$__iface" status 2>/dev/null)" local __idx=1 + local __enabled json_load "${__tmp:-{}}" @@ -60,9 +61,10 @@ __network_gateway() json_select "$((__idx++))" json_get_var __tmp target + json_get_var __enabled enabled - case "${__family}/${__tmp}" in - 4/0.0.0.0|6/::) + case "${__enabled}/${__family}/${__tmp}" in + 1/4/0.0.0.0|1/6/::) json_get_var "$__var" nexthop return $? ;; -- cgit v1.2.3