diff options
| author | Jan Kiszka <jan.kiszka@web.de> | 2017-04-30 17:28:01 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-12 15:08:30 +0100 |
| commit | b467a22729bea886d7bde976c9606ac8e4589cde (patch) | |
| tree | 517627a47d797e19d6ae698c3f928512cb490a76 | |
| parent | b33356d168c0fec9b2df387b51240fa6566ca145 (diff) | |
| download | poky-b467a22729bea886d7bde976c9606ac8e4589cde.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: 7a47752f8223f3c0ed4354d5e39f1319071acf41)
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Ross Burton <ross.burton@intel.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 | |||
