* minor fixes like ident, kernel modules, removing not needed

  vmplayer2.5 feature (to bring it in sync with dirk changes)


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

5 files changed, 20 insertions, 56 deletions

diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm
index 626d68aa..523bcd59 100644
--- a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm
@@ -47,7 +47,7 @@ sub fillRunlevelScript
     my $kind     = shift;
 
     my $script = unshiftHereDoc(<<"    End-of-Here");
-        #! /bin/sh
+        #!/bin/sh
         # completely generic start/stop script, generated via stage1 'vmware' plugin
         # install
         # inspiration taken from vmware start script:
@@ -75,13 +75,9 @@ sub fillRunlevelScript
               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
     } elsif ($kind eq 'vmpl1.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.o
@@ -89,7 +85,6 @@ sub fillRunlevelScript
         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.o
@@ -98,13 +93,11 @@ sub fillRunlevelScript
         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.o
               insmod \${module_src_path}/vmnet.o
-              #insmod \${module_src_path}/vmci.o
-              insmod \${module_src_path}/vmmon.o
+              insmod \${module_src_path}/vmblock.o
         End-of-Here
     }
 
@@ -115,7 +108,7 @@ sub fillRunlevelScript
         unload_modules() {
           # to be filled with the proper list within via the stage1
           # configuration script
-          rmmod vmmon vmblock vmnet vmci vmmon 2>/dev/null
+          rmmod vmmon vmblock vmnet vmmon 2>/dev/null
 
         }
     End-of-Here
@@ -132,9 +125,9 @@ sub fillRunlevelScript
             # the path might be directly point to the plugin dir
     End-of-Here
     if ($kind eq 'vmpl2.5' || $kind eq 'local25') {
-      $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid -n 0\n";
+      $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";
+      $script .= "$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0\n";
     }
     $script .= unshiftHereDoc(<<"    End-of-Here");
           fi
diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm
index 023f7089..230fa309 100644
--- a/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm
@@ -62,13 +62,9 @@ sub fillRunlevelScript
               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
     } elsif ($kind eq 'vmpl1.0') {
         $script .= unshiftHereDoc(<<"        End-of-Here");
-              # load modules manually
               vmware_kind_path=/opt/openslx/plugin-repo/vmware/\${vmware_kind}/
               module_src_path=\${vmware_kind_path}/vmroot/modules
               insmod \${module_src_path}/vmmon.o
@@ -76,7 +72,6 @@ sub fillRunlevelScript
         End-of-Here
     } elsif ($kind ne "vmpl2.0") {
         $script .= unshiftHereDoc(<<"        End-of-Here");
-              # load modules manually
               vmware_kind_path=/opt/openslx/plugin-repo/vmware/\${vmware_kind}/
               module_src_path=\${vmware_kind_path}/vmroot/modules
               insmod \${module_src_path}/vmmon.o
@@ -85,13 +80,11 @@ sub fillRunlevelScript
         End-of-Here
     } elsif ($kind eq 'vmpl2.5') {
         $script .= unshiftHereDoc(<<"        End-of-Here");
-              # load modules manually
               vmware_kind_path=/opt/openslx/plugin-repo/vmware/\${vmware_kind}/
               module_src_path=\${vmware_kind_path}/vmroot/modules
               insmod \${module_src_path}/vmmon.o
               insmod \${module_src_path}/vmnet.o
-              #insmod \${module_src_path}/vmci.o
-              insmod \${module_src_path}/vmmon.o
+              insmod \${module_src_path}/vmblock.o
         End-of-Here
     }
 
@@ -102,7 +95,7 @@ sub fillRunlevelScript
         unload_modules() {
           # to be filled with the proper list within via the stage1
           # configuration script
-          rmmod vmmon vmblock vmnet vmci vmmon 2>/dev/null
+          rmmod vmmon vmblock vmnet vmmon 2>/dev/null
         }
     End-of-Here
 
diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm
index 312e5006..a0c3564c 100644
--- a/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm
@@ -58,13 +58,9 @@ sub fillRunlevelScript
               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
     } elsif ($kind eq 'vmpl1.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.o
@@ -72,7 +68,6 @@ sub fillRunlevelScript
         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.o
@@ -81,13 +76,11 @@ sub fillRunlevelScript
         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.o
               insmod \${module_src_path}/vmnet.o
-              #insmod \${module_src_path}/vmci.o
-              insmod \${module_src_path}/vmmon.o
+              insmod \${module_src_path}/vmblock.o
         End-of-Here
     }
 
@@ -98,7 +91,7 @@ sub fillRunlevelScript
         unload_modules() {
           # to be filled with the proper list within via the stage1
           # configuration script
-          rmmod vmmon vmblock vmnet vmci vmmon 2>/dev/null
+          rmmod vmmon vmblock vmnet vmmon 2>/dev/null
         }
     End-of-Here
 
diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm
index 79f8212a..78542909 100644
--- a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm
@@ -66,7 +66,6 @@ sub fillRunlevelScript
         End-of-Here
     } elsif ($kind eq 'vmpl1.0') {
         $script .= unshiftHereDoc(<<"        End-of-Here");
-                  # load modules manually
                   vmware_kind_path=/opt/openslx/plugin-repo/vmware/\${vmware_kind}/
                   module_src_path=\${vmware_kind_path}/vmroot/modules
                   insmod \${module_src_path}/vmmon.o
@@ -74,22 +73,19 @@ sub fillRunlevelScript
         End-of-Here
     } elsif ($kind ne "vmpl2.0") {
         $script .= unshiftHereDoc(<<"        End-of-Here");
-              # load modules manually
-              vmware_kind_path=/opt/openyslx/plugin-repo/vmware/\${vmware_kind}/
-              module_src_path=\${vmware_kind_path}/vmroot/modules
-              insmod \${module_src_path}/vmmon.o
-              insmod \${module_src_path}/vmnet.o
-              insmod \${module_src_path}/vmblock.o
+                  vmware_kind_path=/opt/openslx/plugin-repo/vmware/\${vmware_kind}/
+                  module_src_path=\${vmware_kind_path}/vmroot/modules
+                  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 modules manually
-              vmware_kind_path=/opt/openslx/plugin-repo/vmware/\${vmware_kind}/
-              module_src_path=\${vmware_kind_path}/vmroot/modules
-              insmod \${module_src_path}/vmmon.o
-              insmod \${module_src_path}/vmnet.o
-              #insmod \${module_src_path}/vmci.o
-              insmod \${module_src_path}/vmmon.o
+                  vmware_kind_path=/opt/openslx/plugin-repo/vmware/\${vmware_kind}/
+                  module_src_path=\${vmware_kind_path}/vmroot/modules
+                  insmod \${module_src_path}/vmmon.o
+                  insmod \${module_src_path}/vmnet.o
+                  insmod \${module_src_path}/vmblock.o
         End-of-Here
     }
 
@@ -100,7 +96,7 @@ sub fillRunlevelScript
         unload_modules() {
           # to be filled with the proper list within via the stage1
           # configuration script
-          rmmod vmmon vmblock vmnet vmci vmmon 2>/dev/null
+          rmmod vmmon vmblock vmnet vmmon 2>/dev/null
         }
     End-of-Here
 
diff --git a/os-plugins/plugins/vmware/XX_vmware.sh b/os-plugins/plugins/vmware/XX_vmware.sh
index eed9b2c3..f413f829 100644
--- a/os-plugins/plugins/vmware/XX_vmware.sh
+++ b/os-plugins/plugins/vmware/XX_vmware.sh
@@ -192,17 +192,6 @@ $(ipcalc -m $vmip/$vmpx|sed s/.*=//) {" \
     for i in "/dev/vmnet0 c 119 0" "/dev/vmmon c 10 165"; do
       mknod $i
     done
-    # looks like it gets created by insmod
-    # but permission wasnt correct. 666 was on a testclient
-    # won't work here. two systems, to different node informations
-    # we have to run it after vmci is loaded
-    # and we don't need vmci, because its just for communications
-    # between more as one VM
-    #if [ "${vmware_kind}" = "vmpl2.5" && ! -e /dev/vmci ]; then
-    #  mknod --mode=666 /dev/vmci c 10 $(cat /proc/misc|grep vmci|awk '{print $1}')
-    #elsif [ "${vmware_kind}" == "vmpl2.5" ]; then
-    #  chmod 666 /dev/vmci
-    #fi
 
     chmod 0700 /dev/vmnet*
     chmod 1777 /mnt/etc/vmware/fd-loop