From 3c91f7cd8fad1d6910a1124d0654ee4265e7ab28 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 18 Apr 2016 17:16:07 +0200
Subject: fix parsing of rsync_opts and change to explicit rsync_rsh option in
 config file

---
 packager/openslx.config    | 2 +-
 packager/openslx.functions | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packager/openslx.config b/packager/openslx.config
index 9c94226d..ff6354bf 100644
--- a/packager/openslx.config
+++ b/packager/openslx.config
@@ -1,5 +1,5 @@
 # default options used by rsync
-DEFAULT_RSYNC_OPTS="-e ssh -c arcfour -oStrictHostKeyChecking=no"
+DEFAULT_RSYNC_RSH="ssh -c arcfour -o StrictHostKeyChecking=no"
 
 # default size for the qcow2-container (the one containing diffs)
 DEFAULT_CONTAINER_SIZE="25G"
diff --git a/packager/openslx.functions b/packager/openslx.functions
index 78208cd4..0e28cc15 100644
--- a/packager/openslx.functions
+++ b/packager/openslx.functions
@@ -278,16 +278,15 @@ clone_host() {
 	done
 
 	# prepare rsync's options
-	local RSYNC_OPTS="$DEFAULT_RSYNC_OPTS"
-	[ -z "$RSYNC_OPTS" ] && RSYNC_OPTS="-e ssh -c arcfour -oStrictHostKeyChecking=no"
+	local RSYNC_RSH="$DEFAULT_RSYNC_RSH"
+	[ -z "$RSYNC_RSH" ] && RSYNC_RSH="ssh -c arcfour -oStrictHostKeyChecking=no"
 	local RSYNC_SOURCE="root@$REMOTE_HOST:/"
 
 	# if something goes wrong during rsync, we need to recreate the .stage4 flag
 	add_cleanup touch ${RSYNC_TARGET}/.stage4
 	# run rsync with the exclude/include lists created earlier
 	cat "$INCLUDE" "$EXCLUDE" | \
-		rsync --verbose \
-				--acls \
+		rsync --acls \
 				--hard-links \
 				--xattrs \
 				--archive \
@@ -295,7 +294,7 @@ clone_host() {
 				--delete-excluded \
 				--numeric-ids \
 				--exclude-from=- \
-				"${RSYNC_OPTS}" \
+                --rsh "${RSYNC_RSH}" \
 				"${RSYNC_SOURCE}" \
 				"${RSYNC_TARGET}"
 
-- 
cgit v1.2.3-55-g7522