Merge pull request #102 from deajan/no-resume

Added --no-resume option

CHANGELOG.md

@@ -9,6 +9,7 @@ dd Mmm YYYY: osync v1.2.2. release
 
 dd Mmm YYYY: osync v1.2.1 release
 
+- Added --no-resume option in order to disable resuming execution on failure
 - Fixed missing options passed to subprocess in daemon mode
 - Fixed bogus pgrep can lead to segfault 11 because of recursive KillChilds
 - Fixed osync deletion not working on systems with ssh banner enabled

dev/n_osync.sh

@@ -2066,6 +2066,7 @@ function Usage {
 	echo "--no-maxtime      Disables any soft and hard execution time checks"
 	echo "--force-unlock    Will override any existing active or dead locks on initiator and target replica"
 	echo "--on-changes      Will launch a sync task after a short wait period if there is some file activity on initiator replica. You should try daemon mode instead"
+	echo "--no-resume       Do not try to resume a failed run. By default, execution is resumed once"
 	echo ""
 	echo "[QUICKSYNC OPTIONS]"
 	echo "--initiator=\"\"		Master replica path. Will contain state and backup directory (is mandatory)"
@@ -2243,6 +2244,10 @@ for i in "$@"; do
 		_NOLOCKS=true
 		_LOGGER_PREFIX="date"
 		;;
+		--no-resume)
+		opts=$opts" --no-resume"
+		RESUME_TRY=0
+		;;
 		--no-locks)
 		_NOLOCKS=true
 		;;