From 31a49734ff8448e0efd18e48d045f6fd79dcd25e Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Mon, 25 Feb 2008 15:20:44 +0000
Subject: * added support for specifying additional rsync options via
 environment   variable SLX_RSYNC_OPTIONS (for both cloning and exporting) *
 log rsync-cmd with verbose-level=2 when exporting a vendor-OS

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1571 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 installer/OpenSLX/OSExport/FileSystem/NFS.pm | 10 ++++++----
 installer/OpenSLX/OSSetup/Engine.pm          |  4 +++-
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'installer')

diff --git a/installer/OpenSLX/OSExport/FileSystem/NFS.pm b/installer/OpenSLX/OSExport/FileSystem/NFS.pm
index 1c4f5fbf..9ab1ddfe 100644
--- a/installer/OpenSLX/OSExport/FileSystem/NFS.pm
+++ b/installer/OpenSLX/OSExport/FileSystem/NFS.pm
@@ -147,10 +147,12 @@ sub _copyViaRsync
 	my $includeExcludeList = $self->_determineIncludeExcludeList();
 	vlog(1, _tr("using include-exclude-filter:\n%s\n", $includeExcludeList));
 	my $rsyncFH;
-	open(
-		$rsyncFH, '|-', 
-		"rsync -av --delete-excluded --exclude-from=- $source/ $target"
-	)
+	my $additionalRsyncOptions = $ENV{SLX_RSYNC_OPTIONS} || '';
+	my $rsyncCmd
+		= "rsync -av --delete-excluded --exclude-from=- $additionalRsyncOptions"
+			. " $source/ $target";
+	vlog(2, "executing: $rsyncCmd\n");
+	open($rsyncFH, '|-', $rsyncCmd)
 		or die _tr("unable to start rsync for source '%s', giving up! (%s)",
 				   $source, $!);
 	print $rsyncFH $includeExcludeList;
diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm
index aeeb377d..3dc7d7c2 100644
--- a/installer/OpenSLX/OSSetup/Engine.pm
+++ b/installer/OpenSLX/OSSetup/Engine.pm
@@ -1608,8 +1608,10 @@ sub _clone_fetchSource
 	);
 	my $excludeIncludeList = $self->_clone_determineIncludeExcludeList();
 	vlog(1, "using exclude-include-filter:\n$excludeIncludeList\n");
+	my $additionalRsyncOptions = $ENV{SLX_RSYNC_OPTIONS} || '';
 	my $rsyncCmd 
-		= "rsync -av --delete --exclude-from=- $source $self->{'vendor-os-path'}";
+		= "rsync -av --delete --exclude-from=- $additionalRsyncOptions"
+			. " $source $self->{'vendor-os-path'}";
 	vlog(2, "executing: $rsyncCmd\n");
 	my $rsyncFH;
 	open($rsyncFH, '|-', $rsyncCmd)
-- 
cgit v1.2.3-55-g7522