From 28de3ffefa54527831d932cabc9bdcca8adf94e2 Mon Sep 17 00:00:00 2001 From: Andris PE Date: Tue, 26 Mar 2024 21:53:06 +0200 Subject: [PATCH] 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 Link: https://github.com/openwrt/openwrt/pull/14986 Signed-off-by: Robert Marko (cherry picked from commit 207bfee855320dc938f39e179b1d2e3b008140cb) --- package/network/config/netifd/Makefile | 2 +- package/network/config/netifd/files/etc/init.d/network | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile index 82a04adecd..95f1f6f7d1 100644 --- 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 dc208c4ce0..86340b77e5 100755 --- 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 } -- 2.30.2