From 1e5cafec603d985dbd8083ccdaf3afe8bb7970a7 Mon Sep 17 00:00:00 2001
From: Dirk
Date: Fri, 2 May 2014 20:43:43 +0200
Subject: Script cleanup ...

---
 .../plugins/vmware/OpenSLX/OSPlugin/vmware.pm      | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
index 930fcccb..390e8b26 100644
--- a/src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
+++ b/src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
@@ -308,27 +308,17 @@ sub _writeRunlevelScript
         "tempdir",
         "$script"
     );
-    $modlist = "vmnet vmmon ";
+    $modlist = "vmnet vmmon vsock vmci vmblock";
     $script = unshiftHereDoc(<<"    End-of-Here");
         # VMplayer common stuff
         insmod ${modpath}/vmmon.ko || return 1
         insmod ${modpath}/vmnet.ko || return 1
+        # Newer VMplayers specific stuff
+        insmod ${modpath}/vmci.ko
+        insmod ${modpath}/vmblock.ko
+        insmod ${modpath}/vsock.ko
     End-of-Here
-    if ($kind eq 'local3X' || $kind eq 'local4X' || $kind eq 'local5X' || $kind eq 'local6X') {
-        $script .= unshiftHereDoc(<<"        End-of-Here");
-            # Newer VMplayers specific stuff
-            insmod ${modpath}/vmci.ko
-            insmod ${modpath}/vmblock.ko
-            insmod ${modpath}/vsock.ko
-        End-of-Here
-        $modlist .= "vsock vmci vmblock";
-    } elsif ($kind eq 'local20' || $kind eq 'local25') {
-        $script .= unshiftHereDoc(<<"        End-of-Here");
-            # VMplayer 2.X specific stuff
-            insmod ${modpath}/vmblock.ko
-        End-of-Here
-        $modlist .= "vmblock";
-    }
+
     $initfile->addFunction(
         "load_modules",
         "$script"
-- 
cgit v1.2.3-55-g7522