* added support for letting plugins suggest additional kernel modules

* used this new functionality in the theme and vmware plugins to suggest
  the kernel modules they need (this should fix showing the console in ubuntu)
* added distro-specific kernel module filtering, such that there no longer are
  the spurious warnings about 'hid', 'unix' and/or 'af_packet' not being found

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

2 files changed, 27 insertions, 1 deletions

diff --git a/os-plugins/plugins/theme/OpenSLX/OSPlugin/theme.pm b/os-plugins/plugins/theme/OpenSLX/OSPlugin/theme.pm
index a00cd8a2..c2897eec 100644
--- a/os-plugins/plugins/theme/OpenSLX/OSPlugin/theme.pm
+++ b/os-plugins/plugins/theme/OpenSLX/OSPlugin/theme.pm
@@ -133,6 +133,21 @@ sub suggestAdditionalKernelParams
 	return @suggestedParams;
 }
 
+sub suggestAdditionalKernelModules
+{
+	my $self                = shift;
+	my $makeInitRamFSEngine = shift;
+
+	my @suggestedModules;
+	
+	# Ubuntu needs vesafb and fbcon (which drags along some others)
+	if ($makeInitRamFSEngine->{'distro-name'} =~ m{^ubuntu}i) {
+		push @suggestedModules, qw(	vesafb fbcon )
+	}
+	
+	return @suggestedModules;
+}
+
 sub copyRequiredFilesIntoInitramfs
 {
 	my $self                = shift;
@@ -179,7 +194,7 @@ sub copyRequiredFilesIntoInitramfs
 	}
 
 	vlog(
-		0, 
+		1, 
 		_tr(
 			"theme-plugin: bootsplash=%s displaymanager=%s", 
 			$splashTheme, $displayManagerTheme
diff --git a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
index 69492160..b466dd17 100644
--- a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
@@ -77,4 +77,15 @@ sub getAttrInfo
 	};
 }
 
+sub suggestAdditionalKernelModules
+{
+	my $self                = shift;
+	my $makeInitRamFSEngine = shift;
+
+	# simply suggest these and see where we go from there (what is vmblock?)
+	my @suggestedModules = qw( vmmon vmnet vmblock );
+	
+	return @suggestedModules;
+}
+
 1;