diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-21 20:34:48 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-21 20:34:48 +0000 |
| commit | d65660976b4068a3a6ad16dfdc974f37bd70fde0 (patch) | |
| tree | 2d9553d3a04650460e6712ed53d4795465c5007f /package/netifd/files/lib | |
| parent | 06c4117a5a4c18ea093c5f046eed777f5dbf650e (diff) | |
netifd: improve error handling in legacy script compatibility library, do not fill the log with error messages for interfaces that could not be found
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31432 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/netifd/files/lib')
| -rwxr-xr-x | package/netifd/files/lib/network/config.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/netifd/files/lib/network/config.sh b/package/netifd/files/lib/network/config.sh index 287124de6..3b3ae9340 100755 --- a/package/netifd/files/lib/network/config.sh +++ b/package/netifd/files/lib/network/config.sh @@ -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 |