TOPIC:

--- /etc/ha-lizard/ha-lizard.func
+++ /etc/ha-lizard/ha-lizard.func
@@ -322,7 +322,7 @@ function ha_disabled ()

 function check_xapi ()
 {
-	ping -c 1 -w 1 $1 1> /dev/null
+	ping -c 1 -w 2 $1 1> /dev/null
 	if [ $? -eq 0 ]
 	then
 		XAPI_RESP=$(curl --silent $1 | grep -c -E "Citrix|XCP")
@@ -417,7 +417,7 @@ function vm_mon ()
   case $OP_MODE in
 	1)
 		log $FUNCNAME "ha-lizard in operating mode 1 - managing pool appliances"
-		VAPP_LIST=$($XE appliance-list | grep -e uuid | $AWK -F ": " '{print $2}')
+		VAPP_LIST=($($XE appliance-list | grep -e uuid | $AWK -F ": " '{print $2}'))
 		VAPP_COUNT=${#VAPP_LIST[@]}
 		log $FUNCNAME "$VAPP_COUNT vapps found: ${VAPP_LIST[*]}"

@@ -1495,7 +1495,7 @@ function check_quorum ()

 	for i in ${IP_LIST[@]}
 	do
-		ping -c 1 -w 1 $i > /dev/null
+		ping -c 1 -w 2 $i > /dev/null
 		if [ $? -eq 0 ]
 		then
 			log $FUNCNAME "Host IP: $i Response = OK"
@@ -1516,7 +1516,7 @@ function check_quorum ()
 		for j in ${FENCE_HEURISTICS_IPS[@]}
 		do
 			H_COUNT=$(($H_COUNT + 1))
-			ping -c 1 -w 1 $j > /dev/null
+			ping -c 1 -w 2 $j > /dev/null
 			if [ $? -eq 0 ]
 			then
 				log $FUNCNAME "Heuristic IP: $j Response = OK"

--- /etc/iscsi-ha/scripts/drbd-sb-tool
+++ /etc/iscsi-ha/scripts/drbd-sb-tool
@@ -171,7 +171,7 @@ do
			drbdadm disconnect ${RESOURCES_ARRAY[$DRBD_RESOURCE_SELECT]} 2> /dev/null
		fi
		drbdadm secondary ${RESOURCES_ARRAY[$DRBD_RESOURCE_SELECT]} 2> /dev/null
-		drbdadm -- --discard-my-data connect ${RESOURCES_ARRAY[$DRBD_RESOURCE_SELECT]}
+		drbdadm connect --discard-my-data ${RESOURCES_ARRAY[$DRBD_RESOURCE_SELECT]}
		RETVAL=$?
		if [ $RETVAL -eq 0 ]
		then