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>
This commit is contained in:
parent
9e02580d52
commit
8b3e170526
@ -993,7 +993,7 @@ drv_mac80211_setup() {
|
|||||||
add_ap=1
|
add_ap=1
|
||||||
ubus wait_for hostapd
|
ubus wait_for hostapd
|
||||||
ubus call hostapd config_add "{\"iface\":\"$primary_ap\", \"config\":\"${hostapd_conf_file}\"}"
|
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
|
wireless_add_process "$hostapd_pid" "/usr/sbin/hostapd" 1
|
||||||
fi
|
fi
|
||||||
ret="$?"
|
ret="$?"
|
||||||
|
@ -1125,7 +1125,7 @@ wpa_supplicant_run() {
|
|||||||
|
|
||||||
[ "$ret" != 0 ] && wireless_setup_vif_failed WPA_SUPPLICANT_FAILED
|
[ "$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
|
wireless_add_process "$supplicant_pid" "/usr/sbin/wpa_supplicant" 1
|
||||||
|
|
||||||
return $ret
|
return $ret
|
||||||
|
Loading…
Reference in New Issue
Block a user