[openwrt/openwrt] wifi-scripts: fix failing mesh setup with missing wpa_supplicant
LEDE Commits
lede-commits at lists.infradead.org
Thu Dec 12 07:46:10 PST 2024
blocktrron pushed a commit to openwrt/openwrt.git, branch openwrt-24.10:
https://git.openwrt.org/aa1241e9794c2c03b74f14fef8530507ee4fc2f7
commit aa1241e9794c2c03b74f14fef8530507ee4fc2f7
Author: David Bauer <mail at david-bauer.net>
AuthorDate: Thu Dec 12 16:36:50 2024 +0100
wifi-scripts: fix failing mesh setup with missing wpa_supplicant
The initialization of mesh interfaces currently fail when wpa_supplicant
is not installed. This is due to the script calling the wpa_supplicant
feature indicator without verifying wpa_supplicant is installed at all.
To avoid failing, first check if wpa_supplicant is installed before
determining the available featureset.
Signed-off-by: David Bauer <mail at david-bauer.net>
(cherry picked from commit 1be18c6daad83bc4198dc7aefd9979b7fe8fbfd4)
---
.../network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh b/package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh
index 3d953eff74..ad1a4c86df 100755
--- a/package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh
+++ b/package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh
@@ -1017,7 +1017,7 @@ mac80211_setup_vif() {
json_get_vars $MP_CONFIG_INT $MP_CONFIG_BOOL $MP_CONFIG_STRING
wireless_vif_parse_encryption
[ -z "$htmode" ] && htmode="NOHT";
- if wpa_supplicant -vmesh; then
+ if [ -x /usr/sbin/wpa_supplicant ] && wpa_supplicant -vmesh; then
mac80211_setup_supplicant || failed=1
else
mac80211_setup_mesh
More information about the lede-commits
mailing list