diff options
Diffstat (limited to 'package/base-files')
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rw-r--r-- | package/base-files/files/lib/functions/network.sh | 14 |
2 files changed, 11 insertions, 5 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index b58843163f..ca1cb47a6c 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk include $(INCLUDE_DIR)/feeds.mk PKG_NAME:=base-files -PKG_RELEASE:=191 +PKG_RELEASE:=192 PKG_FLAGS:=nonshared PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ diff --git a/package/base-files/files/lib/functions/network.sh b/package/base-files/files/lib/functions/network.sh index 08cce49df2..d7fd2dea57 100644 --- a/package/base-files/files/lib/functions/network.sh +++ b/package/base-files/files/lib/functions/network.sh @@ -6,10 +6,16 @@ __network_ifstatus() { local __tmp - [ -z "$__NETWORK_CACHE" ] && \ - export __NETWORK_CACHE="$(ubus call network.interface dump)" - - __tmp="$(jsonfilter ${4:+-F "$4"} ${5:+-l "$5"} -s "$__NETWORK_CACHE" -e "$1=@.interface${2:+[@.interface='$2']}$3")" + [ -z "$__NETWORK_CACHE" ] && { + __tmp="$(ubus call network.interface dump 2>&1)" + case "$?" in + 4) : ;; + 0) export __NETWORK_CACHE="$__tmp" ;; + *) echo "$__tmp" >&2 ;; + esac + } + + __tmp="$(jsonfilter ${4:+-F "$4"} ${5:+-l "$5"} -s "${__NETWORK_CACHE:-{}}" -e "$1=@.interface${2:+[@.interface='$2']}$3")" [ -z "$__tmp" ] && \ unset "$1" && \ |