projects
/
15.05
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6fdbe0f
)
[package] base-files: only consider enabled default routes when finding the wan iface...
author
Jo-Philipp Wich
<jow@openwrt.org>
Fri, 29 Jun 2012 11:58:35 +0000
(11:58 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Fri, 29 Jun 2012 11:58:35 +0000
(11:58 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32525
3c298f89
-4303-0410-b956-
a3cf2f4a3e73
package/base-files/files/lib/functions/network.sh
patch
|
blob
|
history
diff --git
a/package/base-files/files/lib/functions/network.sh
b/package/base-files/files/lib/functions/network.sh
index
7475b00
..
c6b98e6
100644
(file)
--- 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 $?
;;