summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--recipes/corosync/corosync_1.2.6.bb2
-rw-r--r--recipes/corosync/files/init5
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