From 141f48389d6a87a3286fa7d942a89fcb265c84ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= Date: Sat, 23 Nov 2019 21:43:02 +0100 Subject: [PATCH] fff-wireless: Hide errors if device doesn't have radios MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some output and exit status are hidden, as they are a valid behaviour if the device doesn't have any radios. Signed-off-by: Fabian Bläse Reviewed-by: Christian Dresel --- src/packages/fff/fff-wireless/Makefile | 2 +- src/packages/fff/fff-wireless/files/etc/gateway.d/28-wifi | 6 ++++-- .../fff/fff-wireless/files/lib/functions/fff/wireless | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/packages/fff/fff-wireless/Makefile b/src/packages/fff/fff-wireless/Makefile index 5ae864ab..8d053453 100644 --- a/src/packages/fff/fff-wireless/Makefile +++ b/src/packages/fff/fff-wireless/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-wireless -PKG_RELEASE:=10 +PKG_RELEASE:=11 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/src/packages/fff/fff-wireless/files/etc/gateway.d/28-wifi b/src/packages/fff/fff-wireless/files/etc/gateway.d/28-wifi index 6158c296..dd2a649a 100644 --- a/src/packages/fff/fff-wireless/files/etc/gateway.d/28-wifi +++ b/src/packages/fff/fff-wireless/files/etc/gateway.d/28-wifi @@ -49,9 +49,11 @@ configure() { } apply() { - uci commit wireless + uci -q commit wireless + return 0 } revert() { - uci revert wireless + uci -q revert wireless + return 0 } diff --git a/src/packages/fff/fff-wireless/files/lib/functions/fff/wireless b/src/packages/fff/fff-wireless/files/lib/functions/fff/wireless index c531e077..b4eede42 100644 --- a/src/packages/fff/fff-wireless/files/lib/functions/fff/wireless +++ b/src/packages/fff/fff-wireless/files/lib/functions/fff/wireless @@ -8,7 +8,7 @@ wifiListRadio() { return 1 fi - uci show wireless | sed -n 's,.*\.\([a-z0-9]*\)=wifi-device,\1,p' + uci -q show wireless | sed -n 's,.*\.\([a-z0-9]*\)=wifi-device,\1,p' return 0 }