summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Bauer2024-12-12 15:36:50 +0000
committerDavid Bauer2024-12-12 15:41:10 +0000
commitaa1241e9794c2c03b74f14fef8530507ee4fc2f7 (patch)
treee6cde922edf3245bd952f17512584f24a6bfe848
parent28de3ffefa54527831d932cabc9bdcca8adf94e2 (diff)
downloadopenwrt-aa1241e9794c2c03b74f14fef8530507ee4fc2f7.tar.gz
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@david-bauer.net> (cherry picked from commit 1be18c6daad83bc4198dc7aefd9979b7fe8fbfd4)
-rwxr-xr-xpackage/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh2
1 files changed, 1 insertions, 1 deletions
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