From a2f7912a1615a683a1d6ebd0ee8697b1fa87427a Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Wed, 4 Mar 2009 00:01:33 +0000
Subject: Small fixes for the bridge configuration. Automatic adding of the
 bridge module as Michael suggested. Changing the VERSIONS to be in line with
 the movements towards stable version 5 (latter one is branched, the trunk
 will run for 5.1 from now on ...)

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2666 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm       | 14 ++++++++++++++
 .../vmware/init-hooks/20-nw-bridge-config/bridge.sh        |  1 +
 2 files changed, 15 insertions(+)

(limited to 'os-plugins/plugins/vmware')

diff --git a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
index 7a4ff531..a930a4e6 100644
--- a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
@@ -684,4 +684,18 @@ sub _vmpl1Installation {
         
 }
 
+# The bridge configuration needs the bridge module to be present in early
+# stage3
+sub suggestAdditionalKernelModules
+{
+    my $self                = shift;
+    my $makeInitRamFSEngine = shift;
+
+    my @suggestedModules;
+
+    push @suggestedModules, qw( bridge );
+
+    return @suggestedModules;
+}
+
 1;
diff --git a/os-plugins/plugins/vmware/init-hooks/20-nw-bridge-config/bridge.sh b/os-plugins/plugins/vmware/init-hooks/20-nw-bridge-config/bridge.sh
index 437426db..dad86337 100755
--- a/os-plugins/plugins/vmware/init-hooks/20-nw-bridge-config/bridge.sh
+++ b/os-plugins/plugins/vmware/init-hooks/20-nw-bridge-config/bridge.sh
@@ -10,6 +10,7 @@
 # General information about OpenSLX can be found at http://openslx.org
 #
 # Init hook to create a bridge on the active network interface
+# (should be kept identical to the files of virtualbox and qemukvm plugins)
 #############################################################################
 
 local bridge=br0
-- 
cgit v1.2.3-55-g7522