From 47182b8280ad80d5e6f464af159c956b9a41c2ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Han?= <han.sebastien@gmail.com>
Date: Thu, 6 Sep 2012 01:01:45 +0200
Subject: [PATCH] remove pill command and use ps instead

---
 .DS_Store        | Bin 0 -> 6148 bytes
 ocf/nova-network |   3 +--
 2 files changed, 1 insertion(+), 2 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..c96996127af8dbd3647d2405c6e5903ff9083ea4
GIT binary patch
literal 6148
zcmeHK%}T>S5Z-O8MpVc}^tgDg(oz%!4<S_WD5TJX6-|uVKuAiH+Cz-S7xEQ+3!lfC
z-3eIjSwv=F_xpBdW;gpm_D2XI-C5Wb!WKeUP!J`OC5GKgT@4CGlsHB<3F0(>)>|+k
z-(Ls(_NGY1t+)^7U%x+&vb@vzkd0<*Wp&L0+Z+v}BuwXSI!nUr(i^99FADDhe|n{P
z?&q`2^{3i%;pb!UXg)~O82E^yhf$c1ukD?p*zdH}$zj=6Mfd0!d9PQN>tOb~wY_(6
zdOq-rr}Fv5h$um0ZCivjyaJ&$JbKe4PLl`dsiW&CMpl3oU<FtKR=_AgCxo@Zg0KRt
z04wlK0o)%H6hw!xGN`u>sPOuX{uUw{aC}Q3Dnf^_G6)_pX;J}As-!1|H0jW<D9$0Q
z44QNy^~^91&0IfTq@Er6l@1ruF~~J5zzQrX&@@dO&;K*{WtKkj7gM;!3a|qIOaa;I
zdwmxcMQ7`e<>6VYpxi(~!?+3w81RKl05otP+0{<tSI8mGA*>AIDA=#l0r?`J1>uSn
I_yq+%0ZJ7{j{pDw

literal 0
HcmV?d00001

diff --git a/ocf/nova-network b/ocf/nova-network
index ec01529..29596de 100644
--- a/ocf/nova-network
+++ b/ocf/nova-network
@@ -169,7 +169,6 @@ nova_network_validate() {
 
     check_binary $OCF_RESKEY_binary
     check_binary netstat
-    check_binary dsmask
 
     # A config file on shared storage that is not available
     # during probes is OK.
@@ -301,8 +300,8 @@ nova_network_stop() {
 
     # Try SIGTERM
     pid=`cat $OCF_RESKEY_pid`
+    pid="$pid `ps ax | grep -v grep | grep 'dnsmasq' | cut -c1-5`"
     ocf_run kill -s TERM $pid
-    pkill dnsmask
     rc=$?
     if [ $rc -ne 0 ]; then
         ocf_log err "OpenStack Nova Network (nova-network) couldn't be stopped"