diff --git a/CHANGELOG.md b/CHANGELOG.md index bd69b24..d803479 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/dev/n_osync.sh b/dev/n_osync.sh index f21f04b..e7ae3f4 100755 --- a/dev/n_osync.sh +++ b/dev/n_osync.sh @@ -2267,6 +2267,8 @@ 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)" @@ -2444,6 +2446,10 @@ for i in "$@"; do _NOLOCKS=true _LOGGER_PREFIX="date" ;; + --no-resume) + opts=$opts" --no-resume" + RESUME_TRY=0 + ;; --no-locks) _NOLOCKS=true ;;