netifd: check if /sbin/wifi exists before calling it

Avoid harmless error from network script by checking presence of
now-optional wifi support script, most notably confusing users of x86
snapshots.

Fixes: #14964
Signed-off-by: Andris PE <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/14986
Signed-off-by: Robert Marko <[email protected]>
(cherry picked from commit 207bfee855320dc938f39e179b1d2e3b008140cb)

diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile
index 82a04adecd932054c15b7fee53693053bb552609..95f1f6f7d11e09928874753ae10355ec84ef448f 100644 (file)
--- a/package/network/config/netifd/Makefile
+++ b/package/network/config/netifd/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netifd
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git

diff --git a/package/network/config/netifd/files/etc/init.d/network b/package/network/config/netifd/files/etc/init.d/network
index dc208c4ce0a1f5982d732860111421257540bfd2..86340b77e53c6eada22ded2193cbbe406bd8a40b 100755 (executable)
--- a/package/network/config/netifd/files/etc/init.d/network
+++ b/package/network/config/netifd/files/etc/init.d/network
@@ -30,12 +30,12 @@ reload_service() {
 
        init_switch
        ubus call network reload || rv=1
-       /sbin/wifi reload_legacy
+       [ -x /sbin/wifi ] && /sbin/wifi reload_legacy
        return $rv
 }
 
 stop_service() {
-       /sbin/wifi down
+       [ -x /sbin/wifi ] && /sbin/wifi down
        ifdown -a
        sleep 1
 }