* added 'export-path' (which defaults to '/srv/openslx/export').

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

2 files changed, 5 insertions, 1 deletions

diff --git a/config-db/OpenSLX/Basics.pm b/config-db/OpenSLX/Basics.pm
index 06b1ebd9..1523778a 100644
--- a/config-db/OpenSLX/Basics.pm
+++ b/config-db/OpenSLX/Basics.pm
@@ -40,6 +40,7 @@ my $loadedTranslationModule;
 );
 $openslxConfig{'bin-path'} = "$openslxConfig{'base-path'}/bin",
 $openslxConfig{'db-basepath'} = "$openslxConfig{'private-path'}/db",
+$openslxConfig{'export-path'} = "$openslxConfig{'public-path'}/export",
 $openslxConfig{'share-path'} = "$openslxConfig{'base-path'}/share",
 $openslxConfig{'tftpboot-path'} = "$openslxConfig{'public-path'}/tftpboot",
 
@@ -69,6 +70,9 @@ my %openslxCmdlineArgs = (
 	'base-path=s' => \$cmdlineConfig{'base-path'},
 		# basic path to project files (binaries, functionality templates and
 		# distro-specs)
+	'export-path=s' => \$cmdlineConfig{'export-path'},
+		# path to root of all exports, each different export-type (e.g. nfs, nbd)
+		# has a separate subfolder in here.
 	'private-path=s' => \$cmdlineConfig{'private-path'},
 		# path to private data (which is accessible for clients and
 		# contains all data required for booting the clients)
diff --git a/config-db/OpenSLX/ConfigDB.pm b/config-db/OpenSLX/ConfigDB.pm
index 8f74a359..9e2ab0fd 100644
--- a/config-db/OpenSLX/ConfigDB.pm
+++ b/config-db/OpenSLX/ConfigDB.pm
@@ -863,7 +863,7 @@ sub aggregatedSystemFileInfosOfSystem
 		my $type = $system->{'export_type'};
 		my $serverIpToken = '@@@server_ip@@@';
 		$exportURI
-			= "$type://$serverIpToken$openslxConfig{'public-path'}/$type/$vendorOS->{path}";
+			= "$type://$serverIpToken$openslxConfig{'export-path'}/$type/$vendorOS->{path}";
 	}
 
 	my @variantIDs = fetchSystemVariantIDsOfSystem($confDB, $system->{id});