commit cd08b68161a541965a68433979ed6bb188fe39ec Author: David Vossel Date: Thu Feb 20 17:47:47 2014 -0500 Fix: controld: Do not consider the dlm up until the address list is present (cherry picked from commit 84c45113eadf321d69b13a5c34529d7234c26c0f) diff --git a/extra/resources/controld b/extra/resources/controld index bf5466d..2cc5f4d 100644 --- a/extra/resources/controld +++ b/extra/resources/controld @@ -159,8 +159,8 @@ controld_start() { controld_monitor; rc=$? case $rc in $OCF_SUCCESS) - check_dir=/sys/kernel/config/dlm/cluster/comms - if grep 1 $check_dir/*/local >/dev/null 2>&1; then + local addr_list=$(cat /sys/kernel/config/dlm/cluster/comms/*/addr_list 2>/dev/null) + if [ $? -eq 0 ] && [ -n "$addr_list" ]; then return $OCF_SUCCESS fi ;;