[openwrt/openwrt] wifi-scripts: fix failing mesh setup with missing wpa_supplicant

LEDE Commits lede-commits at lists.infradead.org
Thu Dec 12 07:40:49 PST 2024


blocktrron pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/1be18c6daad83bc4198dc7aefd9979b7fe8fbfd4

commit 1be18c6daad83bc4198dc7aefd9979b7fe8fbfd4
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>
---
 .../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 c835b46e75..1fb3edf055 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
@@ -1023,7 +1023,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