projects
/
librecmc
/
librecmc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3678ba6
)
netifd: improve error handling in legacy script compatibility library, do not fill...
author
Felix Fietkau
<nbd@openwrt.org>
Sat, 21 Apr 2012 20:34:48 +0000
(20:34 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Sat, 21 Apr 2012 20:34:48 +0000
(20:34 +0000)
SVN-Revision: 31432
package/netifd/files/lib/network/config.sh
patch
|
blob
|
history
diff --git
a/package/netifd/files/lib/network/config.sh
b/package/netifd/files/lib/network/config.sh
index 287124de66312e7fb972e70855fe0181780c7a61..3b3ae93404849a9b4ff63747df9c9c638ed9fdc3 100755
(executable)
--- 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
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
}
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"
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
json_get_var l3dev l3_device
[ -n "$l3dev" ] && ifname="$l3dev"
json_init