fff-wireless: Hide errors if device doesn't have radios

Submitted by Fabian Blaese on Nov. 23, 2019, 8:54 p.m.

Details

Message ID 20191123205406.107640-1-fabian@blaese.de
State Accepted
Headers show

Commit Message

Fabian Blaese Nov. 23, 2019, 8:54 p.m.
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 <fabian@blaese.de>
---
 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(-)

Patch hide | download patch | download mbox

diff --git a/src/packages/fff/fff-wireless/Makefile b/src/packages/fff/fff-wireless/Makefile
index 5ae864a..8d05345 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 6158c29..dd2a649 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 c531e07..b4eede4 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
 }
 

Comments

Christian Dresel Nov. 23, 2019, 8:59 p.m.
Reviewed-by: Christian Dresel <fff@chrisi01.de>
Fabian Blaese Nov. 23, 2019, 10:24 p.m.
applied.