* added support to NBD_Squash-exporter for selecting the next free server-port

  automatically
* added missing code to clean dependent data if removing an export (systems)
  or a vendor-OS (exports and systems)



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

1 files changed, 16 insertions, 3 deletions

diff --git a/installer/OpenSLX/OSExport/ExportType/NBD_Squash.pm b/installer/OpenSLX/OSExport/ExportType/NBD_Squash.pm
index 3d2d10fa..52395b65 100644
--- a/installer/OpenSLX/OSExport/ExportType/NBD_Squash.pm
+++ b/installer/OpenSLX/OSExport/ExportType/NBD_Squash.pm
@@ -48,7 +48,6 @@ sub exportVendorOS
 		= mapRsyncFilter2Regex($source, $includeExcludeList);
 	vlog 1, _tr("using include-exclude-filter:\n%s\n", $includeExcludeList);
 	$self->createSquashFS($source, $target, $includeExcludeList);
-	$self->showNbdParams($target);
 }
 
 sub purgeExport
@@ -98,6 +97,20 @@ sub checkRequirements
 	1;
 }
 
+sub addExportToConfigDB
+{
+	my $self = shift;
+	my $export = shift;
+	my $openslxDB = shift;
+
+	$export->{port}
+		= $openslxDB->incrementGlobalCounter('next-nbd-server-port');
+
+	my $res = $openslxDB->addExport($export);
+	$self->showNbdParams($export)		if $res;
+	return $res;
+}
+
 ################################################################################
 ### implementation methods
 ################################################################################
@@ -145,11 +158,11 @@ sub createSquashFS
 sub showNbdParams
 {
 	my $self = shift;
-	my $target = shift;
+	my $export = shift;
 
 	print (('#' x 80)."\n");
 	print _tr("Please make sure you start a corresponding nbd-server:\n\t%s\n",
-			  "nbd-server port $self->{engine}->{'export-path'} -r");
+			  "nbd-server $export->{port} $self->{engine}->{'export-path'} -r");
 	print (('#' x 80)."\n");
 }