File bug-977201_pacemaker-controld-dlm-stateful_merge_wait-2.patch of Package pacemaker.3577
commit 7eb08baba16e7848f0e101822939b72f0b765fd8
Author: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Tue May 31 15:21:12 2016 +0200
controld: fix "[: -eq: unary operator expected" issue from PR 1022
diff --git a/extra/resources/controld b/extra/resources/controld
index 7d75319..19fa4f6 100644
--- a/extra/resources/controld
+++ b/extra/resources/controld
@@ -229,7 +229,7 @@ controld_monitor() {
case $rc in
0) smw=$(dlm_tool status -v | grep "stateful_merge_wait=" | cut -d= -f2)
- if [ $smw -eq 1 ]; then
+ if [ -n "$smw" ] && [ $smw -eq 1 ]; then
ocf_log err "DLM status is: stateful_merge_wait"
rc=$OCF_ERR_GENERIC
elif [ -z "$smw" ] && dlm_tool ls | grep -q "wait fencing" && \