From 4ba7143744320cfb5037e328c2aa25ff316d3ba5 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Sun, 30 Apr 2017 17:28:01 +0200 Subject: [PATCH] tcf-agent: Fix daemon termination The upstream init script uses SIGUSR2 to terminate that daemon because SIGTERM is ignored. As the killproc function does not support specifying a signal, switch to start-stop-daemon. Drop the retry loop because SIGUSR2 is lethal for agent. (From OE-Core rev: b27d804dd0cbce3e4ed43e7fdfcc4e12c141e78d) Signed-off-by: Jan Kiszka Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../tcf-agent/tcf-agent/tcf-agent.init | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init b/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init index 6303280aae..f90208555b 100755 --- a/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init +++ b/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init @@ -33,16 +33,7 @@ case "$1" in stop) echo -n "Stopping $DAEMON_NAME: " - count=0 - while [ -n "`/bin/pidof $DAEMON_PATH`" -a $count -lt 10 ] ; do - killproc $DAEMON_PATH >& /dev/null - sleep 1 - RETVAL=$? - if [ $RETVAL != 0 -o -n "`/bin/pidof $DAEMON_PATH`" ] ; then - sleep 3 - fi - count=`expr $count + 1` - done + start-stop-daemon -K -q -x $DAEMON_PATH -s USR2 rm -f /var/lock/subsys/$DAEMON_NAME if [ -n "`/bin/pidof $DAEMON_PATH`" ] ; then echo "FAIL" @@ -72,4 +63,3 @@ case "$1" in esac exit $RETVAL -