mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-27 13:16:35 +00:00
Merge remote-tracking branch 'thingos/dev' into dev
This commit is contained in:
commit
c0b1fcff80
@ -30,7 +30,7 @@ stop() {
|
|||||||
msg_begin "Stopping eudev"
|
msg_begin "Stopping eudev"
|
||||||
${PROG_UA} control --stop-exec-queue
|
${PROG_UA} control --stop-exec-queue
|
||||||
killall -q $(basename ${PROG})
|
killall -q $(basename ${PROG})
|
||||||
test $? == 0 && msg_done || msg_fail
|
msg_done
|
||||||
}
|
}
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
|
@ -71,7 +71,14 @@ start() {
|
|||||||
|
|
||||||
iwconfig ${OS_WLAN} power off &> /dev/null
|
iwconfig ${OS_WLAN} power off &> /dev/null
|
||||||
iw ${OS_WLAN} set power_save 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
|
count=0
|
||||||
while true; do
|
while true; do
|
||||||
sleep 1
|
sleep 1
|
||||||
@ -80,7 +87,7 @@ start() {
|
|||||||
break
|
break
|
||||||
fi
|
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
|
test -n "${module}" && msg_fail "failed (${module})"|| msg_fail
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
@ -97,7 +104,7 @@ start() {
|
|||||||
|
|
||||||
stop() {
|
stop() {
|
||||||
msg_begin "Stopping wpa_supplicant"
|
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
|
ps | grep wifi | grep -v $$ | grep -v grep | tr -s ' ' | sed -e 's/^\s//' | cut -d ' ' -f 1 | xargs -r kill
|
||||||
msg_done
|
msg_done
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user