Merge remote-tracking branch 'thingos/dev' into dev

This commit is contained in:
Calin Crisan 2019-02-17 16:28:49 +02:00
commit c0b1fcff80
2 changed files with 11 additions and 4 deletions

View File

@ -30,7 +30,7 @@ stop() {
msg_begin "Stopping eudev"
${PROG_UA} control --stop-exec-queue
killall -q $(basename ${PROG})
test $? == 0 && msg_done || msg_fail
msg_done
}
case "$1" in

View File

@ -71,7 +71,14 @@ start() {
iwconfig ${OS_WLAN} power off &> /dev/null
iw ${OS_WLAN} set power_save off &> /dev/null
${PROG} -i${OS_WLAN} -c${CONF} -D${DRIVER} -B &> ${LOG}
opts="-i${OS_WLAN} -c${CONF} -D${DRIVER} -B"
if [[ ${OS_DEBUG} == "true" ]]; then
opts+=" -dd"
fi
${PROG} ${opts} &>> ${LOG}
count=0
while true; do
sleep 1
@ -80,7 +87,7 @@ start() {
break
fi
if [[ ${count} -gt ${LINK_WATCH_TIMEOUT} ]] || ! pidof wpa_supplicant > /dev/null; then
if [[ ${count} -gt ${LINK_WATCH_TIMEOUT} ]] || ! pidof $(basename ${PROG}) > /dev/null; then
test -n "${module}" && msg_fail "failed (${module})"|| msg_fail
return 1
fi
@ -97,7 +104,7 @@ start() {
stop() {
msg_begin "Stopping wpa_supplicant"
killall wpa_supplicant &>/dev/null
killall -q $(basename ${PROG})
ps | grep wifi | grep -v $$ | grep -v grep | tr -s ' ' | sed -e 's/^\s//' | cut -d ' ' -f 1 | xargs -r kill
msg_done
}