Use command line option for SBD_DELAY_START in sbd.sh

src/sbd-common.c

@@ -89,7 +89,7 @@ usage(void)
 "			(default is 5, set to 0 to disable)\n"
 "-F <N>		# of failures before a servant is considered faulty (optional)\n"
 "			(default is 1, set to 0 to disable)\n"
-"-A             Enable start delay (wait for msgwait seconds at start) (optional)\n"
+"-A		Enable start delay (wait for msgwait seconds at start) (optional)\n"
 "-P		Check Pacemaker quorum and node health (optional, watch only)\n"
 "-Z		Enable trace mode. WARNING: UNSAFE FOR PRODUCTION!\n"
 "Commands:\n"

src/sbd.sh

@@ -59,16 +59,16 @@ always) SBD_OPTS+=" -S 0" ;;
 clean) SBD_OPTS+=" -S 1" ;;
 esac
 : ${SBD_DELAY_START:="no"}
+if ocf_is_true "$SBD_DELAY_START" ; then
+	SBD_OPTS+=" -A"
+fi
 
 start() {
 	if ! pidofproc -p $SBD_PIDFILE $SBD_BIN >/dev/null 2>&1 ; then
 		if ! $SBD_BIN -d $SBD_DEVICE $SBD_OPTS watch ; then
 			echo "SBD failed to start; aborting."
 			exit 1
 		fi
-		if ocf_is_true ${SBD_DELAY_START} ; then
-			sleep $(sbd -d "$SBD_DEVICE" dump | grep -m 1 msgwait | awk '{print $4}') 2>/dev/null
-		fi
 	else
 		return 0
 	fi