summaryrefslogtreecommitdiff
path: root/setnet.sh
diff options
context:
space:
mode:
authorKatolaZ <katolaz@freaknet.org>2017-03-08 11:14:14 +0000
committerKatolaZ <katolaz@freaknet.org>2017-03-08 11:14:14 +0000
commit32fd87f1db400350eadf87e84ae43d16df383bfb (patch)
tree02374123759dec95f2e369011f3935d68068a30f /setnet.sh
parent74ab155e2cf9d31585425a768968c2701ca8b316 (diff)
Fixed bug in the restart of wpa_supplicant
Diffstat (limited to 'setnet.sh')
-rwxr-xr-xsetnet.sh17
1 files changed, 10 insertions, 7 deletions
diff --git a/setnet.sh b/setnet.sh
index c661fb8..34de178 100755
--- a/setnet.sh
+++ b/setnet.sh
@@ -1142,18 +1142,21 @@ wifi_restart_wpa(){
WPA_PID=$(ps ax | grep wpa_supplicant | grep " -i ${DEVNAME} " |
sed -r -e 's/^\ +//g' | cut -d " " -f 1)
- log "wifi_restart_wpa" "WPA_PID: ${WPA_PID}"
- kill -9 ${WPA_PID}
-
- wpa_supplicant -B -i ${DEVNAME} -c ${WPA_FILE} -P${WPA_PIDFILE} 2>&1 >/dev/null
- WPA_PID=$(ps ax | grep wpa_supplicant | grep " -i ${DEVNAME}" | \
+ if [ -n "${WPA_PID}" ]; then
+ log "wifi_restart_wpa" "WPA_PID: ${WPA_PID}"
+ kill -9 ${WPA_PID}
+ else
+ log "wifi_restart_wpa" "no wpa_supplicant is running!!!"
+ fi
+ wpa_supplicant -B -i ${DEVNAME} -c ${WPA_FILE} -P${WPA_PIDFILE} 2>&1 >/dev/null
+ WPA_PID=$(ps ax | grep wpa_supplicant | grep " -i ${DEVNAME}" | \
sed -r -e 's/^\ +//g' | cut -d " " -f 1 )
- WPA_PID_SAVED=$(cat ${WPA_PIDFILE})
+ WPA_PID_SAVED=$(cat ${WPA_PIDFILE})
log "wifi_restart_wpa" "WPA_PID: ${WPA_PID} WPA_PID_SAVED: ${WPA_PID_SAVED}"
if [ -n "${WPA_PID}" ] && [ "${WPA_PID}" != "${WPA_PID_SAVED}" ]; then
eval "${DIALOG} --msgbox 'Error restarting wpa_supplicant' \
${INFO_HEIGHT} ${INFO_WIDTH}"
- else
+ else
eval "${DIALOG} --msgbox 'wpa_supplicant restarted successfully' \
${INFO_HEIGHT} ${INFO_WIDTH}"
fi