* got vmplayer running without their installer and like on our vmware system

  * not tested on an OpenSLX Client yet!
  * kernel modules can become ugly
  


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

4 files changed, 82 insertions, 54 deletions

diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm
index 833a7654..04c72ca4 100644
--- a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm
@@ -72,9 +72,10 @@ sub fillRunlevelScript
     if ($kind eq 'local') {
         $script .= unshiftHereDoc(<<"        End-of-Here");
               # to be filled in via the stage1 configuration script
-              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
+              insmod /lib/modules/\$(uname -r)/misc/vmmon.o || return 1
+              insmod /lib/modules/\$(uname -r)/misc/vmnet.o || return 1
+              insmod /lib/modules/\$(uname -r)/misc/vmblock.o 2>/dev/null || return 0
+              #insmod /lib/modules/\$(uname -r)/misc/vmci.o 2>/dev/null || return 0
               # most probably nobody wants to run the parallel port driver ...
               #modprobe vm...
         End-of-Here
@@ -83,27 +84,27 @@ sub fillRunlevelScript
               # 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}/vmmon.o
+              insmod \${module_src_path}/vmnet.o
         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
+              insmod \${module_src_path}/vmmon.o
+              insmod \${module_src_path}/vmnet.o
+              insmod \${module_src_path}/vmblock.o
         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
+              insmod \${module_src_path}/vmmon.o
+              insmod \${module_src_path}/vmnet.o
+              #insmod \${module_src_path}/vmci.o
+              insmod \${module_src_path}/vmmon.o
         End-of-Here
     }
 
@@ -129,7 +130,13 @@ sub fillRunlevelScript
         setup_vmnet0() {
           if [ -n "\$vmnet0" ] ; then
             # the path might be directly point to the plugin dir
-            $location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0
+    End-of-Here
+    if ($kind eq 'vmpl2.5') {
+      $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid -n 0";
+    } else {
+      $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0";
+    }
+    $script .= unshiftHereDoc(<<"    End-of-Here");
           fi
         }
         # we definately prefer the hostonly interface for NATed operation too
diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm
index 5597612b..54047aca 100644
--- a/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm
@@ -59,9 +59,10 @@ sub fillRunlevelScript
     if ($kind eq 'local') {
         $script .= unshiftHereDoc(<<"        End-of-Here");
               # to be filled in via the stage1 configuration script
-              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
+              insmod /lib/modules/\$(uname -r)/misc/vmmon.o || return 1
+              insmod /lib/modules/\$(uname -r)/misc/vmnet.o || return 1
+              insmod /lib/modules/\$(uname -r)/misc/vmblock.o 2>/dev/null || return 0
+              #insmod /lib/modules/\$(uname -r)/misc/vmci.o 2>/dev/null || return 0
               # most probably nobody wants to run the parallel port driver ...
               #modprobe vm...
         End-of-Here
@@ -70,27 +71,27 @@ sub fillRunlevelScript
               # 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}/vmmon.o
+              insmod \${module_src_path}/vmnet.o
         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
+              insmod \${module_src_path}/vmmon.o
+              insmod \${module_src_path}/vmnet.o
+              insmod \${module_src_path}/vmblock.o
         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
+              insmod \${module_src_path}/vmmon.o
+              insmod \${module_src_path}/vmnet.o
+              #insmod \${module_src_path}/vmci.o
+              insmod \${module_src_path}/vmmon.o
         End-of-Here
     }
 
@@ -114,7 +115,14 @@ sub fillRunlevelScript
         setup_vmnet0() {
           if [ -n "\$vmnet0" ] ; then
             # the path might be directly point to the plugin dir
-            $location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0
+    End-of-Here
+    if ($kind eq 'vmpl2.5') {
+        $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid -n 0";
+    } else {
+        $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0";
+    }
+    $script .= unshiftHereDoc(<<"    End-of-Here");
+            exit 0
           fi
         }
         # we definately prefer the hostonly interface for NATed operation too
diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm
index d42646c9..ea734467 100644
--- a/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm
@@ -55,9 +55,10 @@ sub fillRunlevelScript
     if ($kind eq 'local') {
         $script .= unshiftHereDoc(<<"        End-of-Here");
               # to be filled in via the stage1 configuration script
-              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
+              insmod /lib/modules/\$(uname -r)/misc/vmmon.o || return 1
+              insmod /lib/modules/\$(uname -r)/misc/vmnet.o || return 1
+              insmod /lib/modules/\$(uname -r)/misc/vmblock.o 2>/dev/null || return 0
+              #insmod /lib/modules/\$(uname -r)/misc/vmci.o 2>/dev/null || return 0
               # most probably nobody wants to run the parallel port driver ...
               #modprobe vm...
         End-of-Here
@@ -66,27 +67,27 @@ sub fillRunlevelScript
               # 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}/vmmon.o
+              insmod \${module_src_path}/vmnet.o
         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
+              insmod \${module_src_path}/vmmon.o
+              insmod \${module_src_path}/vmnet.o
+              insmod \${module_src_path}/vmblock.o
         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
+              insmod \${module_src_path}/vmmon.o
+              insmod \${module_src_path}/vmnet.o
+              #insmod \${module_src_path}/vmci.o
+              insmod \${module_src_path}/vmmon.o
         End-of-Here
     }
 
@@ -112,7 +113,13 @@ sub fillRunlevelScript
         setup_vmnet0() {
           if [ -n "\$vmnet0" ] ; then
             # the path might be directly point to the plugin dir
-            $location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0
+    End-of-Here
+    if ($kind eq 'vmpl2.5') {
+        $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid -n 0";
+    } else {
+        $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0";
+    }
+    $script .= unshiftHereDoc(<<"    End-of-Here");
           fi
         }
         # we definately prefer the hostonly interface for NATed operation too
diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm
index 97d0f4f7..e9b8f121 100644
--- a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm
@@ -60,9 +60,10 @@ sub fillRunlevelScript
     if ($kind eq 'local') {
         $script .= unshiftHereDoc(<<"        End-of-Here");
               # to be filled in via the stage1 configuration script
-              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
+              insmod /lib/modules/\$(uname -r)/misc/vmmon.o || return 1
+              insmod /lib/modules/\$(uname -r)/misc/vmnet.o || return 1
+              insmod /lib/modules/\$(uname -r)/misc/vmblock.o 2>/dev/null || return 0
+              #insmod /lib/modules/\$(uname -r)/misc/vmci.o 2>/dev/null || return 0
               # most probably nobody wants to run the parallel port driver ...
               #modprobe vm...
         End-of-Here
@@ -71,27 +72,27 @@ sub fillRunlevelScript
               # 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}/vmmon.o
+              insmod \${module_src_path}/vmnet.o
         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
+              insmod \${module_src_path}/vmmon.o
+              insmod \${module_src_path}/vmnet.o
+              insmod \${module_src_path}/vmblock.o
         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
+              insmod \${module_src_path}/vmmon.o
+              insmod \${module_src_path}/vmnet.o
+              #insmod \${module_src_path}/vmci.o
+              insmod \${module_src_path}/vmmon.o
         End-of-Here
     }
 
@@ -115,9 +116,14 @@ sub fillRunlevelScript
         setup_vmnet0() {
           if [ -n "\$vmnet0" ] ; then
             # the path might be directly point to the plugin dir
-            $location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0
-            # new style (v6.5)
-            #$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid -n 0
+    End-of-Here
+    if ($kind eq 'vmpl2.5') {
+        $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid -n 0";
+    } else {
+        $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0";
+    }
+    $script .= unshiftHereDoc(<<"    End-of-Here");
+            exit 0
           fi
         }
         # we definately prefer the hostonly interface for NATed operation too