Zhou Zheng Sheng has uploaded a new change for review.

Change subject: spmstop: add "--" to /usr/bin/kill invocation parameters
......................................................................

spmstop: add "--" to /usr/bin/kill invocation parameters

In Ubuntu kill, invocation like "kill -9 -xxx" is not parsed correctly.
We should use "kill -9 -- -xxx" instead.

The patch is on going work of porting VDSM to Ubuntu
http://www.ovirt.org/VDSM_on_Ubuntu

Change-Id: I4746290d4b6c8130c3ecd94f1ef6bd53689b991f
Signed-off-by: Zhou Zheng Sheng <zhshz...@linux.vnet.ibm.com>
---
M vdsm/storage/protect/spmstop.sh
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/17/12817/1

diff --git a/vdsm/storage/protect/spmstop.sh b/vdsm/storage/protect/spmstop.sh
index c4d8706..fc707e1 100755
--- a/vdsm/storage/protect/spmstop.sh
+++ b/vdsm/storage/protect/spmstop.sh
@@ -61,17 +61,17 @@
     exit 0
 else
     log "Stopping lease for pool: $spUUID pgrps: $spmprotect_pgrps"
-    $KILL -USR1 $spmprotect_pgrps >/dev/null 2>&1
+    $KILL -USR1 -- $spmprotect_pgrps >/dev/null 2>&1
 fi
 
 for ((i=0; i<10; i+=1)); do
     sleep 1
-    killed_len=$($KILL -0 $spmprotect_pgrps 2>&1 | wc -l)
+    killed_len=$($KILL -0 -- $spmprotect_pgrps 2>&1 | wc -l)
     [[ "$killed_len" == "$spmprotect_pgrps_len" ]] && break
 done
 
 if [[ "$killed_len" != "$spmprotect_pgrps_len" ]]; then
-    $KILL -9 $spmprotect_pgrps
+    $KILL -9 -- $spmprotect_pgrps
 fi
 
 exit 0


--
To view, visit http://gerrit.ovirt.org/12817
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4746290d4b6c8130c3ecd94f1ef6bd53689b991f
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Zhou Zheng Sheng <zhshz...@linux.vnet.ibm.com>
_______________________________________________
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Reply via email to