From d0c12b4cab4568aebcb8d249ef701e7b856e0b6d Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 18 Apr 2016 18:02:42 +0200
Subject: 25G > 20G default container size

---
 packager/openslx.config    | 10 +++++++++-
 packager/openslx.functions | 12 +++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/packager/openslx.config b/packager/openslx.config
index ff6354bf..5680295c 100644
--- a/packager/openslx.config
+++ b/packager/openslx.config
@@ -1,8 +1,16 @@
+RSYNC_OPTS="--acls \
+	--hard-links \
+	--xattrs \
+	--archive \
+	--delete \
+	--delete-excluded \
+	--numeric-ids"
+
 # default options used by rsync
 DEFAULT_RSYNC_RSH="ssh -c arcfour -o StrictHostKeyChecking=no"
 
 # default size for the qcow2-container (the one containing diffs)
-DEFAULT_CONTAINER_SIZE="25G"
+DEFAULT_CONTAINER_SIZE="20G"
 
 # default filesystem type for the qcow2-container
 DEFAULT_CONTAINER_FILESYSTEM="xfs"
diff --git a/packager/openslx.functions b/packager/openslx.functions
index 6a95f1f0..138e5f39 100644
--- a/packager/openslx.functions
+++ b/packager/openslx.functions
@@ -286,15 +286,9 @@ clone_host() {
 	add_cleanup touch ${RSYNC_TARGET}/.stage4
 	# run rsync with the exclude/include lists created earlier
 	cat "$INCLUDE" "$EXCLUDE" | \
-		rsync --acls \
-				--hard-links \
-				--xattrs \
-				--archive \
-				--delete \
-				--delete-excluded \
-				--numeric-ids \
+		rsync $RSYNC_OPTS \
 				--exclude-from=- \
-                --rsh "${RSYNC_RSH}" \
+            --rsh "${RSYNC_RSH}" \
 				"${RSYNC_SOURCE}" \
 				"${RSYNC_TARGET}"
 
@@ -324,7 +318,7 @@ create_container() {
 
 	# which size for the qcow2 container?
 	local CONTAINER_SIZE="${DEFAULT_CONTAINER_SIZE}"
-	[ -z "${CONTAINER_SIZE}" ] && CONTAINER_SIZE="25G"
+	[ -z "${CONTAINER_SIZE}" ] && CONTAINER_SIZE="20G"
 
 	# so far so good
 	pinfo "Creating qcow2-container '${CONTAINER_PATH}'"
-- 
cgit v1.2.3-55-g7522