aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-04-21 20:34:48 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-04-21 20:34:48 +0000
commitf387b5deb816fd9cfcbcb0f59d48ad7e189c9bb7 (patch)
tree2d9553d3a04650460e6712ed53d4795465c5007f /package
parentd8d2b5d324c64c2744c617bb1d501e195a631461 (diff)
downloadupstream-f387b5deb816fd9cfcbcb0f59d48ad7e189c9bb7.tar.gz
upstream-f387b5deb816fd9cfcbcb0f59d48ad7e189c9bb7.tar.bz2
upstream-f387b5deb816fd9cfcbcb0f59d48ad7e189c9bb7.zip
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')
-rwxr-xr-xpackage/netifd/files/lib/network/config.sh6
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 287124de66..3b3ae93404 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