Merge branch 'master' into vmgrid

4 files changed, 32 insertions, 13 deletions

diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
index 14f56b48..d222c102 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
@@ -122,6 +122,7 @@ sub KDMConfigHashForWorkstation
     my $kdmVer = "4";
     my $configHash = $self->SUPER::KDMConfigHashForWorkstation();
     $configHash->{'General'}->{PidFile} = "/var/run/kdm.pid";
+    $configHash->{'General'}->{ServerVTs} = "-7";
     $configHash->{'X-:0-Core'}->{Setup} = "/etc/kde$kdmVer/kdm/Xsetup";
     $configHash->{'X-:0-Core'}->{Startup} = "/etc/kde$kdmVer/kdm/Xstartup";
     $configHash->{'X-:0-Core'}->{Session} = "/etc/kde$kdmVer/kdm/Xsession";
diff --git a/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm b/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm
index a948d222..4bd05278 100644
--- a/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm
@@ -1,4 +1,4 @@
-# Copyright (c) 2008 - OpenSLX GmbH
+# Copyright (c) 2008..2010 - OpenSLX GmbH
 #
 # This program is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING
@@ -52,7 +52,9 @@ sub getInfo
             Sets a desktop and creates needed configs, theme can be set as well.
         End-of-Here
         precedence => 40,
-        required => [ qw( xserver ) ],
+        # not really required e.g. for modern autoconfiguring systems like Ubuntu
+        # 10.04
+        # required => [ qw( xserver ) ],
     };
 }
 
diff --git a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
index 4ebaa2b6..7e55019c 100644
--- a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
@@ -132,7 +132,7 @@ sub getAttrInfo
             applies_to_clients => 1,
             description => unshiftHereDoc(<<'            End-of-Here'),
                 Which set of VMware binaries to use: installed (local) or provided by the
-                plugin itself (vmpl1.0, vmpl2.0, vmpl2.5, vmpl3.0)?
+                plugin itself (vmpl1.0, vmpl2.0, vmpl2.5, vmpl3.X)?
             End-of-Here
             # only allow the supported once...
             # TODO: modify if we know which of them work
@@ -363,10 +363,10 @@ sub checkStage3AttrValues
         );
     }
 
-    if ($vm_kind eq 'vmpl3.0' &&
-        ! -d "/opt/openslx/plugin-repo/vmware/vmpl3.0/vmroot") {
+    if ($vm_kind eq 'vmpl3.X' &&
+        ! -d "/opt/openslx/plugin-repo/vmware/vmpl3.X/vmroot") {
         push @problems, _tr(
-            "No OpenSLX installation of VMware Player 3 found or installation failed. Using it as virtual machine wouldn't work!"
+            "No OpenSLX installation of VMware Player 3.X found or installation failed. Using it as virtual machine wouldn't work!"
         );
     }
 
@@ -411,9 +411,9 @@ sub _writeRunlevelScript
         insmod ${modpath}/vmmon.ko || return 1
         insmod ${modpath}/vmnet.ko || return 1
     End-of-Here
-    if ($kind eq 'local30' || $kind eq 'vmpl3.0') {
+    if ($kind eq 'local3X' || $kind eq 'vmpl3.X') {
         $script .= unshiftHereDoc(<<"        End-of-Here");
-            # VMplayer 3.0 specific stuff
+            # VMplayer 3.X specific stuff
             insmod ${modpath}/vmci.ko
             insmod ${modpath}/vmblock.ko
             insmod ${modpath}/vsock.ko
@@ -477,6 +477,15 @@ sub _writeRunlevelScript
         "vmnetif",
         "$script"
     );
+    # vmblock for handling e.g. removable USB devices
+    $script = unshiftHereDoc(<<"        End-of-Here");
+        # let point the path directly to the directory where the binary lives
+          $vmpath/usr/bin/vmware-usbarbitrator
+        End-of-Here
+    $initfile->addFunction(
+        "vmblock",
+        "$script"
+    );
     $script = unshiftHereDoc(<<"        End-of-Here");
         # include default directories
         . /etc/opt/openslx/openslx.conf
@@ -488,6 +497,12 @@ sub _writeRunlevelScript
         load_modules
         vmnetif
         End-of-Here
+    # start the USB arbitrator on higher VMware/player versions (3.0+)
+    if ($kind eq 'vmpl3.X' || $kind eq 'local3X') {
+        $script .= unshiftHereDoc(<<"            End-of-Here");
+            vmblock
+            End-of-Here
+    }
     $initfile->addToCase(
         "start",
         "$script"
@@ -625,6 +640,7 @@ sub _getVersion {
         # else { TODO: errorhandling if file or string doesn't exist }
         chomp($vmversion);
         chomp($vmbuildversion);
+        
 
         $versioninfo{vmversion} = $vmversion;
         $versioninfo{vmbuildversion} = $vmbuildversion;
@@ -667,9 +683,9 @@ sub _localInstallation
         # VMplayer 2.5
         } elsif ($vmversion eq "2.5" || $vmversion eq "6.5") {
             $kind="local25";
-        # VMplayer 3.0, Workstation 7.0
-        } elsif ($vmversion eq "3.0" || $vmversion eq "7.0") {
-            $kind="local30";
+        # VMplayer 3.0, 3.1, Workstation 7.0, 7.1
+        } elsif ($vmversion eq "3.0" || $vmversion eq "7.0" || 
+            $vmversion eq "3.1" || $vmversion eq "7.1") { $kind="local3X";
         }
         # Create runlevel script depending on detected version
         $self->_writeRunlevelScript("$vmpath", "$kind");
diff --git a/os-plugins/plugins/vmware/files/run-virt.include b/os-plugins/plugins/vmware/files/run-virt.include
index 2c501156..714fee36 100644
--- a/os-plugins/plugins/vmware/files/run-virt.include
+++ b/os-plugins/plugins/vmware/files/run-virt.include
@@ -305,10 +305,10 @@ if [ -n "${forcemem}" ]; then
   mem="${forcemem}"
 else
   case "$vmversion" in
-    2.*)
+    2.*|6.*)
       permem=30
       ;;
-    3.*)
+    3.*|7.*)
       permem=25
       ;;
   esac