* applied several fixed to svnos-export and respective modules (as reported by Dirk)

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@772 95ad53e4-c205-0410-b2fa-d234c58c8868

2 files changed, 15 insertions, 2 deletions

diff --git a/installer/OpenSLX/OSExport/Engine.pm b/installer/OpenSLX/OSExport/Engine.pm
index 085d10f7..413f5fde 100644
--- a/installer/OpenSLX/OSExport/Engine.pm
+++ b/installer/OpenSLX/OSExport/Engine.pm
@@ -167,6 +167,9 @@ sub addExportToConfigDB
 {
 	my $self = shift;
 
+print "adding the export to the config-DB is not implemented yet, sorry!\n";
+return;
+
 	my $configDBModule = "OpenSLX::ConfigDB";
 	unless (eval "require $configDBModule") {
 		if ($! == 2) {
@@ -184,6 +187,7 @@ sub addExportToConfigDB
 		my $openslxDB = connectConfigDB();
 		# insert new export if it doesn't already exist in DB:
 		my $exportName = $self->{'vendor-os-name'};
+
 		my $export = fetchExportsByFilter(
 			$openslxDB, { 'name' => $exportName }, 'id'
 		);
diff --git a/installer/OpenSLX/OSExport/ExportType/NFS.pm b/installer/OpenSLX/OSExport/ExportType/NFS.pm
index b5529502..ccaa32c5 100644
--- a/installer/OpenSLX/OSExport/ExportType/NFS.pm
+++ b/installer/OpenSLX/OSExport/ExportType/NFS.pm
@@ -58,6 +58,10 @@ sub exportViaRsync
 	my $source = shift;
 	my $target = shift;
 
+	if (system("mkdir -p $target")) {
+		die _tr("unable to create directory '%s', giving up! (%s)\n",
+				$target, $!);
+	}
 	my $includeExcludeList = $self->determineIncludeExcludeList();
 	vlog 1, "using include-exclude-filter:\n$includeExcludeList\n";
 	open(RSYNC, "| rsync -av --delete --exclude-from=- $source/ $target")
@@ -91,8 +95,13 @@ sub addTargetToNfsExports
 	my $self = shift;
 	my $target = shift;
 
-	my $exports = slurpFile("/etc/exports");
-print "$exports\n";
+	print (('#' x 80)."\n");
+	print _tr("Please make sure the following line is contained in /etc/exports\nin order to activate the NFS-export of this vendor-OS:\n\t%s\n",
+			  "$self->{engine}->{'export-path'}\t*(ro,root_squash,sync,no_subtree_check)");
+	print (('#' x 80)."\n");
+
+# TODO : add something a bit more clever here...
+#	my $exports = slurpFile("/etc/exports");
 }
 
 1;