From 0dbcbd69ba0e7d14f7cd6b4033c4ca1eeff536ef Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Thu, 7 Jun 2007 15:27:21 +0000
Subject: * fixed incorrectly generated exportURI (still used the export-name
 instead   of the vendor-OS-name) [reported by Felix, thanks!]

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1155 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 config-db/OpenSLX/ConfigDB.pm                       | 2 +-
 installer/OpenSLX/OSExport/Engine.pm                | 3 +--
 installer/OpenSLX/OSExport/ExportType/NBD_Squash.pm | 1 +
 installer/OpenSLX/OSExport/ExportType/NFS.pm        | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/config-db/OpenSLX/ConfigDB.pm b/config-db/OpenSLX/ConfigDB.pm
index e51cbbcd..b6755155 100644
--- a/config-db/OpenSLX/ConfigDB.pm
+++ b/config-db/OpenSLX/ConfigDB.pm
@@ -966,7 +966,7 @@ sub aggregatedSystemFileInfoFor
 		my $type = $export->{'type'};
 		my $osExportEngine = instantiateClass("OpenSLX::OSExport::Engine");
 		$osExportEngine->initializeFromExisting($export->{name});
-		$exportURI = $osExportEngine->generateExportURI($export);
+		$exportURI = $osExportEngine->generateExportURI($export, $vendorOS);
 	}
 	$info->{'export-uri'} = $exportURI;
 
diff --git a/installer/OpenSLX/OSExport/Engine.pm b/installer/OpenSLX/OSExport/Engine.pm
index f7046f60..d02ac597 100644
--- a/installer/OpenSLX/OSExport/Engine.pm
+++ b/installer/OpenSLX/OSExport/Engine.pm
@@ -143,9 +143,8 @@ sub purgeExport
 sub generateExportURI
 {
 	my $self = shift;
-	my $export = shift;
 
-	return $self->{exporter}->generateExportURI($export);
+	return $self->{exporter}->generateExportURI(@_);
 }
 
 sub requiredFSMods
diff --git a/installer/OpenSLX/OSExport/ExportType/NBD_Squash.pm b/installer/OpenSLX/OSExport/ExportType/NBD_Squash.pm
index bb26a619..e2a558bd 100644
--- a/installer/OpenSLX/OSExport/ExportType/NBD_Squash.pm
+++ b/installer/OpenSLX/OSExport/ExportType/NBD_Squash.pm
@@ -120,6 +120,7 @@ sub generateExportURI
 {
 	my $self = shift;
 	my $export = shift;
+	my $vendorOS = shift;
 
 	my $server
 		= length($export->{server_ip})
diff --git a/installer/OpenSLX/OSExport/ExportType/NFS.pm b/installer/OpenSLX/OSExport/ExportType/NFS.pm
index f63a2d23..bfe4ba1f 100644
--- a/installer/OpenSLX/OSExport/ExportType/NFS.pm
+++ b/installer/OpenSLX/OSExport/ExportType/NFS.pm
@@ -62,6 +62,7 @@ sub generateExportURI
 {
 	my $self = shift;
 	my $export = shift;
+	my $vendorOS = shift;
 
 	my $server
 		= length($export->{server_ip})
@@ -69,7 +70,7 @@ sub generateExportURI
 			: generatePlaceholderFor('serverip');
 	$server .= ":$export->{port}"		if length($export->{port});
 
-	return "nfs://$server$openslxConfig{'export-path'}/nfs/$export->{name}"
+	return "nfs://$server$openslxConfig{'export-path'}/nfs/$vendorOS->{name}";
 }
 
 sub requiredFSMods
-- 
cgit v1.2.3-55-g7522