From: Mathias Klette <mathias.klette@profitbricks.com>
Date: Wed, 8 May 2013 17:31:31 +0000 (+0200)
Subject: liveboot_rsync: don't use archive option for rsync
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=4e88b267a48a34075e4adf17f911be18b4907cab;p=profitbricks%2Fjenkins-build-scripts.git

liveboot_rsync: don't use archive option for rsync

liveboot_rsync facilitates rsync module whileas dcmanager uses
a dedicated user to sync files via SSH. this causes rsync daemon
on mgmt1 to reset permissions in such a way that dcmanager isn't
capable of resetting the mtime value of "." (parent directory of
destination) and hence throws error in UI. dcmanager doesn't use
the same rsync options (yet), which could make sense to have both
sources operating the same way.
---

diff --git a/liveboot_rsync.sh b/liveboot_rsync.sh
index b356dfc..2d0a69c 100755
--- a/liveboot_rsync.sh
+++ b/liveboot_rsync.sh
@@ -33,7 +33,9 @@ ping_and_rsync() {
 	#
 	if ping -c 1 $(echo $1 | sed -s 's#.*@\(.*\)/.*/#\1#' ) > /dev/null ; then
 		echo "Now rsyncing results to $1 ..."
-		rsync --password-file /etc/rsynclivebuild-send.pass -avv --delete $RSYNC_FILTER $RSYNC_SRC/ rsync://$1
+                # do not preserve time, owner and group in favor of dcmanager
+                # else parent directory will have changed permissions and dcmanager will throw errors
+		rsync --password-file /etc/rsynclivebuild-send.pass -rlpDvv --delete $RSYNC_FILTER $RSYNC_SRC/ rsync://$1
 		figlet "$2 OK"
 	else
 		echo "Warning: $1 down."