diff -uNr cman-2.0.84/cman/init.d/cman cman-2.0.84-startupquorum/cman/init.d/cman --- cman-2.0.84/cman/init.d/cman 2008-10-20 18:16:00.000000000 +0200 +++ cman-2.0.84-startupquorum/cman/init.d/cman 2008-10-20 18:17:35.000000000 +0200 @@ -27,6 +27,12 @@ #CMAN_QUORUM_TIMEOUT=300 [ -z "$CMAN_QUORUM_TIMEOUT" ] && CMAN_QUORUM_TIMEOUT=0 +# CMAN_PREJOIN_EXPECTED -- expected votes joining the cluster. +[ -n "$CMAN_PREJOIN_EXPECTED" ] && cman_join_opts+=" -e $CMAN_PREJOIN_EXPECTED" + +# CMAN_POSTJOIN_EXPECTED -- expected votes after the initial join. +[ -z "$CMAN_POSTJOIN_EXPECTED" ] && CMAN_POSTJOIN_EXPECTED=0 + # CMAN_SHUTDOWN_TIMEOUT -- amount of time to wait for cman to become a # cluster member before calling cman_tool leave during shutdown. # default is 60 seconds @@ -93,6 +99,11 @@ errmsg=$( /usr/sbin/cman_tool -t $CMAN_QUORUM_TIMEOUT \ -q wait 2>&1 ) || return 1 fi + if [ $CMAN_POSTJOIN_EXPECTED -gt 0 ] + then + errmsg=$( /usr/sbin/cman_tool \ + expected -e $CMAN_POSTJOIN_EXPECTED 2>&1 ) || return 1 + fi fi return 0 }