diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-04-21 20:34:48 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-04-21 20:34:48 +0000 |
| commit | f37deb2b1b95489ac2738bca2b00c546bf76db12 (patch) | |
| tree | 14a91fe6b6f700306fd88428e76c7cc5ac3be67c | |
| parent | 3678ba60ca41c590fffcef23e06ed73c944a5042 (diff) | |
| download | upstream-f37deb2b1b95489ac2738bca2b00c546bf76db12.tar.gz upstream-f37deb2b1b95489ac2738bca2b00c546bf76db12.tar.bz2 upstream-f37deb2b1b95489ac2738bca2b00c546bf76db12.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
SVN-Revision: 31432
| -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 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 |