BINPATH added to PATH

support for vmplayer3
further simplifications through DEFAULTDIRS

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

1 files changed, 20 insertions, 3 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";