KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

netifd: improve error handling in legacy script compatibility library, do not fill the log with error messages for interfaces that could not be found

Browse source 
SVN-Revision: 31432
This commit is contained in:
Felix Fietkau 2012-04-21 20:34:48 +00:00
parent 3678ba60ca
commit f37deb2b1b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package/netifd/files/lib/network/config.sh
View file

@ -27,8 +27,8 @@ unbridge() {
ubus_call() {
json_init
local _data="$(ubus call "$1" "$2")"
[ $? -ne 0 ] && return "$?"
local _data="$(ubus -S call "$1" "$2")"
[ -z "$_data" ] && return 1
json_load "$_data"
return 0
}
@ -43,7 +43,7 @@ fixup_interface() {
config_get device "$config" device "$ifname"
[ "bridge" = "$type" ] && ifname="br-$config"
config_set "$config" device "$ifname"
ubus_call "network.interface.$config" status
ubus_call "network.interface.$config" status || return 0
json_get_var l3dev l3_device
[ -n "$l3dev" ] && ifname="$l3dev"
json_init