From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 29 Jun 2012 11:58:35 +0000 (+0000)
Subject: base-files: only consider enabled default routes when finding the wan iface (#11774)
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e6540143528fdb573163f1be9b99be1a99027bd0;p=openwrt%2Fstaging%2Fnbd.git

base-files: only consider enabled default routes when finding the wan iface (#11774)

SVN-Revision: 32525
---

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 $?
 				;;