diff options
| author | David Bauer <mail@david-bauer.net> | 2020-07-31 19:51:51 +0200 |
|---|---|---|
| committer | David Bauer <mail@david-bauer.net> | 2020-07-31 19:51:51 +0200 |
| commit | 8b3e170526cf0f1d9b15a6dd7787789d15e52cd4 (patch) | |
| tree | b9c71487d22d7203efd0ccab133281a1075efe60 | |
| parent | 9e02580d52ef6f2ee1eb38ae4e5977bb6002a552 (diff) | |
| download | upstream-8b3e170526cf0f1d9b15a6dd7787789d15e52cd4.tar.gz upstream-8b3e170526cf0f1d9b15a6dd7787789d15e52cd4.tar.bz2 upstream-8b3e170526cf0f1d9b15a6dd7787789d15e52cd4.zip | |
hostapd: fix incorrect service name
When retrieving the PID for hostapd and wpa_supplicant via ubus the
wrong service name is currently used. This leads to the following error
in the log:
netifd: radio0 (1409): WARNING (wireless_add_process):
executable path /usr/sbin/wpad does not match process path (/proc/exe)
Fixing the service name retrieves the correct PID and therefore the
warning won't occur.
Signed-off-by: David Bauer <mail@david-bauer.net>
| -rw-r--r-- | package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh | 2 | ||||
| -rw-r--r-- | package/network/services/hostapd/files/hostapd.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh index 5214704830..864b15e120 100644 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh @@ -993,7 +993,7 @@ drv_mac80211_setup() { add_ap=1 ubus wait_for hostapd ubus call hostapd config_add "{\"iface\":\"$primary_ap\", \"config\":\"${hostapd_conf_file}\"}" - local hostapd_pid=$(ubus call service list '{"name": "hostapd"}' | jsonfilter -l 1 -e "@['hostapd'].instances['hostapd'].pid") + local hostapd_pid=$(ubus call service list '{"name": "wpad"}' | jsonfilter -l 1 -e "@['wpad'].instances['hostapd'].pid") wireless_add_process "$hostapd_pid" "/usr/sbin/hostapd" 1 fi ret="$?" diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh index f4e2aa559c..268a41a82b 100644 --- a/package/network/services/hostapd/files/hostapd.sh +++ b/package/network/services/hostapd/files/hostapd.sh @@ -1125,7 +1125,7 @@ wpa_supplicant_run() { [ "$ret" != 0 ] && wireless_setup_vif_failed WPA_SUPPLICANT_FAILED - local supplicant_pid=$(ubus call service list '{"name": "hostapd"}' | jsonfilter -l 1 -e "@['hostapd'].instances['supplicant'].pid") + local supplicant_pid=$(ubus call service list '{"name": "wpad"}' | jsonfilter -l 1 -e "@['wpad'].instances['supplicant'].pid") wireless_add_process "$supplicant_pid" "/usr/sbin/wpa_supplicant" 1 return $ret |