diff options
Diffstat (limited to 'os-plugins/plugins/vmware/OpenSLX')
| -rw-r--r-- | os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm | 23 | ||||
| -rw-r--r-- | os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm | 23 | ||||
| -rw-r--r-- | os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm | 23 | ||||
| -rw-r--r-- | os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm | 6 |
4 files changed, 64 insertions, 11 deletions
diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm index bd3e1ffe..a28bc7a1 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm @@ -56,7 +56,14 @@ sub fillRunlevelScript End-of-Here # Load modules - if ($kind eq 'local' || $kind eq 'local25') { + if ($kind eq 'local' || $kind eq 'local25' || $kind eq 'local30') { + if ($kind eq 'local30') { + $script .= unshiftHereDoc(<<" End-of-Here"); + # vmplayer 3.0 specific stuff + insmod /lib/modules/\$(uname -r)/misc/vsock.ko || return 1 + insmod /lib/modules/\$(uname -r)/misc/vmci.ko || return 1 + End-of-Here + } $script .= unshiftHereDoc(<<" End-of-Here"); # to be filled in via the stage1 configuration script insmod /lib/modules/\$(uname -r)/misc/vmmon.ko || return 1 @@ -86,6 +93,16 @@ sub fillRunlevelScript insmod \${module_src_path}/vmnet.ko insmod \${module_src_path}/vmblock.ko End-of-Here + } elsif ($kind eq 'vmpl3.0') { + $script .= unshiftHereDoc(<<" End-of-Here"); + vmware_kind_path=/opt/openslx/plugin-repo/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 + insmod \${module_src_path}/vsock.ko + insmod \${module_src_path}/vmci.ko + End-of-Here } # unload modules @@ -95,7 +112,7 @@ sub fillRunlevelScript unload_modules() { # to be filled with the proper list within via the stage1 # configuration script - rmmod vmmon vmblock vmnet vmmon 2>/dev/null + rmmod vmmon vmblock vmnet vmmon vmci vsock 2>/dev/null } End-of-Here @@ -109,7 +126,7 @@ sub fillRunlevelScript if [ -n "\$vmnet0" ] ; then # the path might be directly point to the plugin dir End-of-Here - if ($kind eq 'vmpl2.5' || $kind eq 'local25') { + if ($kind eq 'vmpl2.5' || $kind eq 'vmpl3.0' || $kind eq 'local25' || $kind eq 'local30') { $script .= " $location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid -n 0\n"; } else { $script .= " $location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0\n"; diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm index c90a722b..3fbed9f9 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm @@ -52,7 +52,14 @@ sub fillRunlevelScript End-of-Here # load modules - if ($kind eq 'local' || $kind eq 'local25') { + if ($kind eq 'local' || $kind eq 'local25' || $kind eq 'local30') { + if ($kind eq 'local30') { + $script .= unshiftHereDoc(<<" End-of-Here"); + # vmplayer 3.0 specific stuff + insmod /lib/modules/\$(uname -r)/misc/vsock.ko || return 1 + insmod /lib/modules/\$(uname -r)/misc/vmci.ko || return 1 + End-of-Here + } $script .= unshiftHereDoc(<<" End-of-Here"); # to be filled in via the stage1 configuration script insmod /lib/modules/\$(uname -r)/misc/vmmon.ko || return 1 @@ -82,6 +89,16 @@ sub fillRunlevelScript insmod \${module_src_path}/vmnet.ko insmod \${module_src_path}/vmblock.ko End-of-Here + } elsif ($kind eq 'vmpl3.0') { + $script .= unshiftHereDoc(<<" End-of-Here"); + vmware_kind_path=/opt/openslx/plugin-repo/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 + insmod \${module_src_path}/vsock.ko + insmod \${module_src_path}/vmci.ko + End-of-Here } # unload modules @@ -91,7 +108,7 @@ sub fillRunlevelScript unload_modules() { # to be filled with the proper list within via the stage1 # configuration script - rmmod vmmon vmblock vmnet vmmon 2>/dev/null + rmmod vmmon vmblock vmnet vmmon vmci vsock 2>/dev/null } End-of-Here @@ -107,7 +124,7 @@ sub fillRunlevelScript if [ -n "\$vmnet0" ] ; then # the path might be directly point to the plugin dir End-of-Here - if ($kind eq 'vmpl2.5' || $kind eq 'local25') { + if ($kind eq 'vmpl2.5' || $kind eq 'vmpl3.0' || $kind eq 'local25' || $kind eq 'local30') { $script .= " $location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid -n 0\n"; } else { $script .= " $location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0\n"; diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm index 5a7403b9..90b8841a 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm @@ -57,7 +57,14 @@ sub fillRunlevelScript End-of-Here # Load modules - if ($kind eq 'local' || $kind eq 'local25') { + if ($kind eq 'local' || $kind eq 'local25' || $kind eq 'local30') { + if ($kind eq 'local30') { + $script .= unshiftHereDoc(<<" End-of-Here"); + # vmplayer 3.0 specific stuff + insmod /lib/modules/\$(uname -r)/misc/vsock.ko || return 1 + insmod /lib/modules/\$(uname -r)/misc/vmci.ko || return 1 + End-of-Here + } $script .= unshiftHereDoc(<<" End-of-Here"); # to be filled in via the stage1 configuration script insmod /lib/modules/\$(uname -r)/misc/vmmon.ko || return 1 @@ -87,6 +94,16 @@ sub fillRunlevelScript insmod \${module_src_path}/vmnet.ko insmod \${module_src_path}/vmblock.ko End-of-Here + } elsif ($kind eq 'vmpl3.0') { + $script .= unshiftHereDoc(<<" End-of-Here"); + vmware_kind_path=/opt/openslx/plugin-repo/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 + insmod \${module_src_path}/vsock.ko + insmod \${module_src_path}/vmci.ko + End-of-Here } # unload modules @@ -96,7 +113,7 @@ sub fillRunlevelScript unload_modules() { # to be filled with the proper list within via the stage1 # configuration script - rmmod vmmon vmblock vmnet vmmon 2>/dev/null + rmmod vmmon vmblock vmnet vmmon vmci vsock 2>/dev/null } End-of-Here @@ -110,7 +127,7 @@ sub fillRunlevelScript if [ -n "\$vmnet0" ] ; then # the path might be directly point to the plugin dir End-of-Here - if ($kind eq 'vmpl2.5'||$kind eq 'local25') { + if ($kind eq 'vmpl2.5' || $kind eq 'vmpl3.0' || $kind eq 'local25' || $kind eq 'local30') { $script .= " $location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid -n 0\n"; } else { $script .= " $location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0\n"; diff --git a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm index ff3e4ec6..ca3dd35b 100644 --- a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm +++ b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm @@ -467,8 +467,8 @@ sub _writeVmwareConfigs { $config .= "version=\"".$versionhash{vmversion}."\"\n"; $config .= "buildversion=\"".$versionhash{vmbuildversion}."\"\n"; - spitFile("$self->{'pluginRepositoryPath'}/$kind/slxvmconfig", $config); - chmod 0755, "$self->{'pluginRepositoryPath'}/$kind/slxvmconfig"; + spitFile("$self->{'pluginRepositoryPath'}/$kind/vmware.conf", $config); + chmod 0755, "$self->{'pluginRepositoryPath'}/$kind/vmware.conf"; $config = "libdir = \"$vmpath\"\n"; spitFile("$self->{'pluginRepositoryPath'}/$kind/config", $config); @@ -550,6 +550,8 @@ sub _localInstallation my $runlevelScript = "$self->{'pluginRepositoryPath'}/$kind/vmware.init"; if ($vmversion eq "2.5") { $self->_writeRunlevelScript($vmbin, $runlevelScript, "local25"); + } elsif ($vmversion eq "3.0") { + $self->_writeRunlevelScript($vmbin, $runlevelScript, "local30"); } else { $self->_writeRunlevelScript($vmbin, $runlevelScript, $kind); } |