diff options
| author |   Vladimir Sorokin <sorokin@altell.ru> | 2010-06-24 12:53:29 +0400 |
|---|---|---|
| committer |   Roman I Khimov <khimov@altell.ru> | 2010-07-12 08:49:53 +0400 |
| commit | 9d4bc378ba2f579d8653803b5e0624558d17413f (patch) | |
| tree | 5de9c2cc70f5626d5e7d106a0ee5e210a89ee482 /recipes/corosync | |
| parent | f65a2a31d30291ce81ce3b4042b41cf66bb41810 (diff) | |
| download | openembedded-9d4bc378ba2f579d8653803b5e0624558d17413f.tar.gz | |
corosync: fix init script
1) use pgrep instead parsing output of "ps"
2) check if nobody needs to kill
Signed-off-by: Vladimir Sorokin <sorokin@altell.ru>
Signed-off-by: Roman I Khimov <khimov@altell.ru>
Diffstat (limited to 'recipes/corosync')
| -rw-r--r-- | recipes/corosync/corosync_1.2.6.bb | 2 | ||||
| -rw-r--r-- | recipes/corosync/files/init | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/recipes/corosync/corosync_1.2.6.bb b/recipes/corosync/corosync_1.2.6.bb index 0512148d2d..41287a0c02 100644 --- a/recipes/corosync/corosync_1.2.6.bb +++ b/recipes/corosync/corosync_1.2.6.bb @@ -1,7 +1,7 @@ DESCRIPTION = "OSI Certified implementation of a complete cluster engine" LICENSE = "BSD" -PR = "r0" +PR = "r1" SRC_URI = " \ ftp://ftp@corosync.org/downloads/corosync-${PV}/corosync-${PV}.tar.gz \ diff --git a/recipes/corosync/files/init b/recipes/corosync/files/init index fc45f433a4..7277ca905b 100644 --- a/recipes/corosync/files/init +++ b/recipes/corosync/files/init @@ -96,7 +96,10 @@ stop() { if [ $do_force = 1 ]; then echo -n "Escalating... " killall -KILL corosync - ps | grep /usr/lib/heartbeat | sed "s,^ *,," | cut -f 1 -d ' ' | xargs kill -9 + pids=`pgrep -f '/usr/lib/heartbeat/*'` + if [ -n "$pids" ]; then + kill -KILL $pids + fi sleep 5 if |