From c5db8d35d59cb3c7848de9b3a51fc8eb0f74c278 Mon Sep 17 00:00:00 2001 From: Volker Uhrig Date: Fri, 10 Oct 2008 20:07:01 +0000 Subject: * Some more preparation. Mainly kernel and plugin config git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2285 95ad53e4-c205-0410-b2fa-d234c58c8868 --- os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm | 31 +++++++++++++++++------- 1 file changed, 22 insertions(+), 9 deletions(-) (limited to 'os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm') diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm index 88860c1d..833a7654 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm @@ -72,15 +72,13 @@ sub fillRunlevelScript if ($kind eq 'local') { $script .= unshiftHereDoc(<<" End-of-Here"); # to be filled in via the stage1 configuration script - # if we don't have vmmon and vmnet it should print out - # an error. vmblock depends on version insmod /lib/modules/\$(uname -r)/misc/vmmon.ko || return 1 insmod /lib/modules/\$(uname -r)/misc/vmnet.ko || return 1 insmod /lib/modules/\$(uname -r)/misc/vmblock.ko 2>/dev/null || return 0 # most probably nobody wants to run the parallel port driver ... #modprobe vm... End-of-Here - } else { + } elsif ($kind eq 'vmpl1.0') { $script .= unshiftHereDoc(<<" End-of-Here"); # load module manuall vmware_kind_path=/opt/openslx/plugin-repo/vmware/\${vmware_kind}/ @@ -88,11 +86,25 @@ sub fillRunlevelScript insmod \${module_src_path}/vmmon.ko insmod \${module_src_path}/vmnet.ko End-of-Here - if ($kind ne "vmpl1.0") { - $script .= unshiftHereDoc(<<" End-of-Here"); - insmod \${module_src_path}/vmblock.ko - End-of-Here - } + } elsif ($kind ne "vmpl2.0") { + $script .= unshiftHereDoc(<<" End-of-Here"); + # load module manuall + vmware_kind_path=/opt/openslx/plugin-repo/vmware/\${vmware_kind}/ + module_src_path=\${vmware_kind_path}/vmroot/modules + insmod \${module_src_path}/vmmon.ko + insmod \${module_src_path}/vmnet.ko + insmod \${module_src_path}/vmblock.ko + End-of-Here + } elsif ($kind eq 'vmpl2.5') { + $script .= unshiftHereDoc(<<" End-of-Here"); + # load module manuall + vmware_kind_path=/opt/openslx/plugin-repo/vmware/\${vmware_kind}/ + module_src_path=\${vmware_kind_path}/vmroot/modules + insmod \${module_src_path}/vmmon.ko + insmod \${module_src_path}/vmnet.ko + insmod \${module_src_path}/vmci.ko + insmod \${module_src_path}/vmmon.ko + End-of-Here } # unload modules @@ -102,7 +114,8 @@ sub fillRunlevelScript unload_modules() { # to be filled with the proper list within via the stage1 # configuration script - rmmod vmmon vmblock vmnet 2>/dev/null + rmmod vmmon vmblock vmnet vmci vmmon 2>/dev/null + } End-of-Here -- cgit v1.2.3-55-g7522