Merge pull request #101 from deajan/fix_options

Fix missing daemon subprocess options

CHANGELOG.md

@@ -1,8 +1,15 @@
 RECENT CHANGES
 --------------
 
+dd Mmm YYYY: osync v1.2.2. release
+
+! Added an option to log conflictual files
+! Presence of conflictual files can trigger a special mail
+! new option FORCE_CONFLICT_PREVALANCE
+
 dd Mmm YYYY: osync v1.2.1 release
 
+- 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
 - Added basic performance profiler to debug version

dev/n_osync.sh

@@ -4,9 +4,10 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance
 AUTHOR="(C) 2013-2017 by Orsiris de Jong"
 CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
 PROGRAM_VERSION=1.2.2-dev
-PROGRAM_BUILD=2017053001
+PROGRAM_BUILD=2017053002
 IS_STABLE=no
 
+
 ##### Execution order						#__WITH_PARANOIA_DEBUG
 #####	Function Name				Is parallel	#__WITH_PARANOIA_DEBUG
 #	GetLocalOS				no		#__WITH_PARANOIA_DEBUG
@@ -2249,9 +2250,11 @@ for i in "$@"; do
 		_NOLOCKS=true
 		;;
 		--errors-only)
-		LOGGER_ERR_ONLY="yes"
+		opts=$opts" --errors-only"
+		_LOGGER_ERR_ONLY=true
 		;;
 		--summary)
+		opts=$opts" --summary"
 		_SUMMARY=true
 		;;
 		--log-conflicts)
@@ -2259,6 +2262,7 @@ for i in "$@"; do
 		opts=$opts" --log-conflicts"
 		;;
 		--no-prefix)
+		opts=$opts" --no-prefix"
 		_LOGGER_PREFIX=""
 		;;
 		--destination-mails=*)