* added support to the OSExport engine for determining the

  required tools, too (not only the kernel modules) - such
  that MakeInitRamFS::Engine can now find out which tools
  are *required* by a specific system and can copy those
  (and bail if they are not available)

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

6 files changed, 40 insertions, 2 deletions

diff --git a/installer/OpenSLX/OSExport/BlockDevice/AoE.pm b/installer/OpenSLX/OSExport/BlockDevice/AoE.pm
index b0439a6d..9a7450f5 100644
--- a/installer/OpenSLX/OSExport/BlockDevice/AoE.pm
+++ b/installer/OpenSLX/OSExport/BlockDevice/AoE.pm
@@ -77,7 +77,16 @@ sub requiredBlockDeviceModules
 {
 	my $self = shift;
 
-	return 'aoe';
+	return qw( aoe );
+}
+
+sub requiredBlockDeviceTools
+{
+	my $self = shift;
+
+	# TODO: is there any such tool?
+
+	return;
 }
 
 sub showExportConfigInfo
diff --git a/installer/OpenSLX/OSExport/BlockDevice/Base.pm b/installer/OpenSLX/OSExport/BlockDevice/Base.pm
index 3650e8be..80868a80 100644
--- a/installer/OpenSLX/OSExport/BlockDevice/Base.pm
+++ b/installer/OpenSLX/OSExport/BlockDevice/Base.pm
@@ -44,6 +44,10 @@ sub requiredBlockDeviceModules
 {
 }
 
+sub requiredBlockDeviceTools
+{
+}
+
 sub showExportConfigInfo
 {
 }
diff --git a/installer/OpenSLX/OSExport/BlockDevice/NBD.pm b/installer/OpenSLX/OSExport/BlockDevice/NBD.pm
index 1199a4dc..fff4b024 100644
--- a/installer/OpenSLX/OSExport/BlockDevice/NBD.pm
+++ b/installer/OpenSLX/OSExport/BlockDevice/NBD.pm
@@ -71,7 +71,14 @@ sub requiredBlockDeviceModules
 {
 	my $self = shift;
 
-	return 'nbd';
+	return qw( nbd );
+}
+
+sub requiredBlockDeviceTools
+{
+	my $self = shift;
+
+	return qw( nbd-client );
 }
 
 sub showExportConfigInfo
diff --git a/installer/OpenSLX/OSExport/Engine.pm b/installer/OpenSLX/OSExport/Engine.pm
index c17a60d6..c8b384d3 100644
--- a/installer/OpenSLX/OSExport/Engine.pm
+++ b/installer/OpenSLX/OSExport/Engine.pm
@@ -166,6 +166,13 @@ sub requiredFSMods
 	return $self->{exporter}->requiredFSMods();
 }
 
+sub requiredFSTools
+{
+	my $self = shift;
+
+	return $self->{exporter}->requiredFSTools();
+}
+
 ################################################################################
 ### implementation methods
 ################################################################################
diff --git a/installer/OpenSLX/OSExport/FileSystem/Base.pm b/installer/OpenSLX/OSExport/FileSystem/Base.pm
index 009ec87d..a59cc944 100644
--- a/installer/OpenSLX/OSExport/FileSystem/Base.pm
+++ b/installer/OpenSLX/OSExport/FileSystem/Base.pm
@@ -65,6 +65,10 @@ sub requiredFSMods
 {
 }
 
+sub requiredFSTools
+{
+}
+
 sub showExportConfigInfo
 {
 }
diff --git a/installer/OpenSLX/OSExport/FileSystem/SquashFS.pm b/installer/OpenSLX/OSExport/FileSystem/SquashFS.pm
index f0618808..87407ca3 100644
--- a/installer/OpenSLX/OSExport/FileSystem/SquashFS.pm
+++ b/installer/OpenSLX/OSExport/FileSystem/SquashFS.pm
@@ -163,6 +163,13 @@ sub requiredFSMods
 	return @mods;
 }
 
+sub requiredFSTools
+{
+	my $self = shift;
+
+	return $self->{'block-device'}->requiredBlockDeviceTools();
+}
+
 sub showExportConfigInfo
 {
 	my $self   = shift;