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>

diff --git a/recipes/corosync/corosync_1.2.6.bb b/recipes/corosync/corosync_1.2.6.bb
index 0512148..41287a0 100644 (file)
--- 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 fc45f43..7277ca9 100644 (file)
--- 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