irda-utils: restart irda daemon correctly
irattach init script restart faulty logic prevents irda daemon from restart correctly. root@qemu0:~# /etc/init.d/irattach restart Restarting IrDA: Terminated root@qemu0:~# ps aux | grep irattach root 541 0.0 0.2 2400 612 ttyS0 S+ 09:05 0:00 grep irattach As above shows, irattach not started after executing restart command. This commit changed the restart command logic: firstly stop, then start. Prompt telling user irattach start successfully or failure also added. (From OE-Core master rev: 39f266138b972b550979909b235a5779828d7d89) (From OE-Core rev: 37ceb9ad0c45aca458e2ff4770b8a0535286a78e) Signed-off-by: Qiang Chen <qiang.chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
01411d9cf0
commit
f8643d57ef
|
@ -8,6 +8,10 @@
|
||||||
# Short-Description: Infrared port support
|
# Short-Description: Infrared port support
|
||||||
### END INIT INFO
|
### END INIT INFO
|
||||||
|
|
||||||
|
NAME="irattach"
|
||||||
|
test -x "$IRDA_DAEMON" || IRDA_DAEMON=/usr/sbin/irattach
|
||||||
|
test -z "$IRATTACH_PID" && IRATTACH_PID=/var/run/irattach.pid
|
||||||
|
|
||||||
# Source function library.
|
# Source function library.
|
||||||
. /etc/init.d/functions
|
. /etc/init.d/functions
|
||||||
|
|
||||||
|
@ -49,30 +53,26 @@ fi
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
start)
|
start)
|
||||||
echo -n "Starting IrDA: "
|
echo -n "Starting IrDA: $NAME"
|
||||||
irattach ${DEVICE} ${ARGS} > /dev/null 2>&1 &
|
start-stop-daemon --start --quiet --exec "$IRDA_DAEMON" ${DEVICE} ${ARGS} --pidfile "$IRATTACH_PID"
|
||||||
echo "$NAME."
|
sleep 1
|
||||||
;;
|
[ -f /var/run/irattach.pid ] && echo " done" || echo " fail"
|
||||||
|
;;
|
||||||
stop)
|
stop)
|
||||||
echo -n "Stopping IrDA: "
|
echo "Stopping IrDA: $NAME"
|
||||||
killall irattach > /dev/null 2>&1
|
start-stop-daemon --stop --quiet --exec "$IRDA_DAEMON" --pidfile "$IRATTACH_PID"
|
||||||
echo "$NAME."
|
;;
|
||||||
;;
|
|
||||||
restart|force-reload)
|
restart|force-reload)
|
||||||
echo -n "Restarting IrDA: "
|
$0 stop
|
||||||
irattach ${DEVICE} ${ARGS} > /dev/null 2>&1 &
|
$0 start
|
||||||
sleep 1
|
;;
|
||||||
killall irattach > /dev/null 2>&1
|
|
||||||
echo "$NAME."
|
|
||||||
;;
|
|
||||||
status)
|
status)
|
||||||
status irattach
|
status irattach
|
||||||
exit $?
|
exit $?
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
N=/etc/init.d/$NAME
|
N=/etc/init.d/$NAME
|
||||||
echo "Usage: $N {start|stop|restart|force-reload|status}" >&2
|
echo "Usage: $N {start|stop|restart|force-reload|status}" >&2
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue