From 93a78272b86cf50105b3ffc7dfddb0f54cfd0ace Mon Sep 17 00:00:00 2001
From: Dirk
Date: Tue, 23 Apr 2013 11:56:22 +0200
Subject: Should fix the VMware USB issue ...

---
 src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm | 10 ++++++----
 src/os-plugins/plugins/vmware/files/run-virt.include     |  7 +++----
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
index f2d9a29b..a0b5c388 100644
--- a/src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
+++ b/src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
@@ -1,4 +1,4 @@
-# Copyright (c) 2008..2011 - OpenSLX G-mbH
+# Copyright (c) 2008..2013 - OpenSLX G-mbH
 #
 # This program is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING
@@ -422,7 +422,7 @@ sub _writeRunlevelScript
         insmod ${modpath}/vmmon.ko || return 1
         insmod ${modpath}/vmnet.ko || return 1
     End-of-Here
-    if ($kind eq 'local3X' || $kind eq 'vmpl3.X' || $kind eq 'local4X') {
+    if ($kind eq 'local3X' || $kind eq 'vmpl3.X' || $kind eq 'local4X' || $kind eq 'local5X') {
         $script .= unshiftHereDoc(<<"        End-of-Here");
             # VMplayer 3.X specific stuff
             insmod ${modpath}/vmci.ko
@@ -513,7 +513,7 @@ sub _writeRunlevelScript
         vmnetif
         End-of-Here
     # start the USB arbitrator on higher VMware/player versions (3.0+)
-    if ($kind eq 'vmpl3.X' || $kind eq 'local3X' || $kind eq 'local4X') {
+    if ($kind eq 'vmpl3.X' || $kind eq 'local3X' || $kind eq 'local4X' || $kind eq 'local5X') {
         $script .= unshiftHereDoc(<<"            End-of-Here");
             vmblock
             End-of-Here
@@ -723,11 +723,13 @@ sub _localInstallation
         # VMplayer 2.5
         } elsif ($vmversion eq "2.5" || $vmversion eq "6.5") {
             $kind="local25";
-        # VMplayer 3.0, 3.1, Workstation 7.0, 7.1
+        # VMplayer 3.0, 3.1, 4.X, 5.X Workstation 7.0, 7.1, 8.X, 9.X
         } elsif ($vmversion eq "3.0" || $vmversion eq "7.0" || 
             $vmversion eq "3.1" || $vmversion eq "7.1") { $kind="local3X";
         } elsif ($vmversion eq "4.0" || $vmversion eq "8.0") {
             $kind="local4X";
+        } elsif ($vmversion eq "5.0" || $vmversion eq "9.0") {
+            $kind="local45";
         }
         # Create runlevel script depending on detected version
         $self->_writeRunlevelScript("$vmpath", "$kind");
diff --git a/src/os-plugins/plugins/vmware/files/run-virt.include b/src/os-plugins/plugins/vmware/files/run-virt.include
index 30e2c3e6..0e91c659 100644
--- a/src/os-plugins/plugins/vmware/files/run-virt.include
+++ b/src/os-plugins/plugins/vmware/files/run-virt.include
@@ -88,7 +88,7 @@ sharedFolder.option = \"alwaysEnabled\"" >>${conffile}
   ;;
 esac
 case "$vmversion" in
-  2.5|3.*|4.*|6.5|7.*|8.*)
+  2.5|3.*|4.*|6.5|7.*|8.*|9.*)
     if [ "${cpu_cores}" -ge "2" 2>/dev/null ]; then
     	numvcpus="2"
     fi
@@ -271,8 +271,7 @@ pref.enableAllSharedFolders = \"TRUE\"
 
 # eula" >${vmhome}/preferences
 
-# different eula parameters from Workstation 9+
-
+# different eula parameters from Workstation 9+/ Player 5+
 case "$vmversion" in
 	3.*|4.*|7.*|8.*)
 		echo "
@@ -282,7 +281,7 @@ pref.eula.0.buildNumber = \"${vmbuild}\"
 pref.eula.1.appName = \"VMware Workstation\"
 pref.eula.1.buildNumber = \"${vmbuild}\"" >>${vmhome}/preferences
 		;;
-	5.*)
+	5.*|9.*)
 		# code
 		echo "
 pref.eula.count = \"2\"
-- 
cgit v1.2.3-55-g7522