diff options
| author | Oliver Tappe | 2007-06-07 17:27:21 +0200 |
|---|---|---|
| committer | Oliver Tappe | 2007-06-07 17:27:21 +0200 |
| commit | 0dbcbd69ba0e7d14f7cd6b4033c4ca1eeff536ef (patch) | |
| tree | 72df2e91cec73e023889bd708ab21f57a6146de3 /installer | |
| parent | typo.. (diff) | |
| download | core-0dbcbd69ba0e7d14f7cd6b4033c4ca1eeff536ef.tar.gz core-0dbcbd69ba0e7d14f7cd6b4033c4ca1eeff536ef.tar.xz core-0dbcbd69ba0e7d14f7cd6b4033c4ca1eeff536ef.zip | |
* 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
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/OpenSLX/OSExport/Engine.pm | 3 | ||||
| -rw-r--r-- | installer/OpenSLX/OSExport/ExportType/NBD_Squash.pm | 1 | ||||
| -rw-r--r-- | installer/OpenSLX/OSExport/ExportType/NFS.pm | 3 |
3 files changed, 4 insertions, 3 deletions
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 |