diff options
author | Jan Kiszka <jan.kiszka@web.de> | 2017-11-14 20:56:19 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-21 14:43:55 +0000 |
commit | 7e357238ef49143ba0a818735553be79972da01f (patch) | |
tree | bc69be508a2c137d6f7478b922a74a40161460db | |
parent | 3961ab82dd51c324f6b2aae9c16d2021b8d75d75 (diff) | |
download | poky-7e357238ef49143ba0a818735553be79972da01f.tar.gz |
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: 1e6235de0a3f6302cee37332f03b1ba403c789d1)
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init | 12 |
1 files changed, 1 insertions, 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 | |||
33 | 33 | ||
34 | stop) | 34 | stop) |
35 | echo -n "Stopping $DAEMON_NAME: " | 35 | echo -n "Stopping $DAEMON_NAME: " |
36 | count=0 | 36 | start-stop-daemon -K -q -x $DAEMON_PATH -s USR2 |
37 | while [ -n "`/bin/pidof $DAEMON_PATH`" -a $count -lt 10 ] ; do | ||
38 | killproc $DAEMON_PATH >& /dev/null | ||
39 | sleep 1 | ||
40 | RETVAL=$? | ||
41 | if [ $RETVAL != 0 -o -n "`/bin/pidof $DAEMON_PATH`" ] ; then | ||
42 | sleep 3 | ||
43 | fi | ||
44 | count=`expr $count + 1` | ||
45 | done | ||
46 | rm -f /var/lock/subsys/$DAEMON_NAME | 37 | rm -f /var/lock/subsys/$DAEMON_NAME |
47 | if [ -n "`/bin/pidof $DAEMON_PATH`" ] ; then | 38 | if [ -n "`/bin/pidof $DAEMON_PATH`" ] ; then |
48 | echo "FAIL" | 39 | echo "FAIL" |
@@ -72,4 +63,3 @@ case "$1" in | |||
72 | esac | 63 | esac |
73 | 64 | ||
74 | exit $RETVAL | 65 | exit $RETVAL |
75 | |||