Set of fixes to run VMplayer 1.0 / Workstation 5.5 properly ...

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

5 files changed, 23 insertions, 52 deletions

diff --git a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
index 9e592fe6..8797998b 100644
--- a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
@@ -295,7 +295,7 @@ sub installationPhase
     }
     # the same with vmware, if ws is installed
     if (-e "/usr/bin/vmware" && ! -e "/usr/bin/vmware.slx-bak") {
-        linkFile("/var/X11R6/bin/vmwarer", "/usr/bin/vmwarer");
+        linkFile("/var/X11R6/bin/vmware", "/usr/bin/vmware");
         rename("/usr/bin/vmware", "/usr/bin/vmware.slx-bak");
     }
     # this kinda sucks. what if we have local installed vmplayer but
@@ -540,13 +540,13 @@ sub _localInstallation
             copyFile("$pluginFilesPath/$file", "$installationPath");
         }
         # copy depends on version and rename it to runvmware, saves one check in stage3
-        if ($vmversion eq "1.0") {
+        if ($vmversion eq "1.0" || $vmversion eq "5.5") {
             print "\n\nDEBUG: player version $vmversion, we use -v1\n\n";
             copyFile("$pluginFilesPath/runvmware-player-v1", "$installationPath", "runvmware");
-        } elsif ($vmversion eq "2.0") {
+        } elsif ($vmversion eq "2.0" || $vmversion eq "6.0") {
             print "\n\nDEBUG: player version $vmversion, we use -v2\n\n";
             copyFile("$pluginFilesPath/runvmware-player-v2", "$installationPath", "runvmware");
-        } elsif ($vmversion eq "2.5") {
+        } elsif ($vmversion eq "2.5" || $vmversion eq "6.5") {
             print "\n\nDEBUG: player version $vmversion, we use -v25\n\n";
             copyFile("$pluginFilesPath/runvmware-player-v25", "$installationPath", "runvmware");
         }
diff --git a/os-plugins/plugins/vmware/XX_vmware.sh b/os-plugins/plugins/vmware/XX_vmware.sh
index d83c6203..70d8b540 100644
--- a/os-plugins/plugins/vmware/XX_vmware.sh
+++ b/os-plugins/plugins/vmware/XX_vmware.sh
@@ -41,9 +41,6 @@ if [ -e /initramfs/plugin-conf/vmware.conf ]; then
     # should contain (seems to be an average one)
     echo -e "# configuration file for vmware background services written in \
 stage3 setup" > /mnt/etc/vmware/slxvmconfig
-    # fixme: sollte unnötig sein, das hier zu tun. "vmware-env" kann hier voll
-    # determiniert werden, siehe Ticket 240
-    echo "vmware_kind=${vmware_kind}" >> /mnt/etc/vmware/slxvmconfig
     if [ "$vmware_bridge" = 1 ] ; then
       echo "vmnet0=true" >> /mnt/etc/vmware/slxvmconfig
     fi
@@ -137,7 +134,7 @@ $(ipcalc -m $vmip/$vmpx|sed s/.*=//) {" \
       echo "00:50:56:F1:30:50" > /mnt/etc/vmware/vmnet-natd-8.mac
       mknod /dev/vmnet8 c 119 8
     fi
-    # copy the runlevelscript to the proper place and activate it
+    # copy the runlevel script to the proper place and activate it
     cp /mnt/opt/openslx/plugin-repo/vmware/${vmware_kind}/vmware.init \
       /mnt/etc/init.d/vmware-env \
       || echo "  * Error copying runlevel script. Shouldn't happen."
diff --git a/os-plugins/plugins/vmware/files/runvmware-player-v1 b/os-plugins/plugins/vmware/files/runvmware-player-v1
index 9e967e16..a76feec7 100644
--- a/os-plugins/plugins/vmware/files/runvmware-player-v1
+++ b/os-plugins/plugins/vmware/files/runvmware-player-v1
@@ -1,15 +1,13 @@
 #!/bin/bash
+# (c) 2003 - 2008 - RZ Universitaet Freiburg
 #
-# Description:  Script for preparing VMware environment Diskless
-#               X Stations and interactive session chooser (v4)
-#               Gets a xml file, reads needed information from it and
-#               orwards it into B drive of vmplayer
+# This program/file is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
 #
-# Author(s):    see project authors file
-#               last changes mj0, 16/10/2008
-# Copyright:    (c) 2003 - 2008 - RZ Universitaet Freiburg
+# If you have any feedback please consult http://openslx.org/feedback and
+# send your feedback to feedback@openslx.org
 #
-# Version:      0.18
+# General information about OpenSLX can be found at http://openslx.org
 #
 ################################################################################
 
@@ -26,7 +24,8 @@ imagename=$(grep -i "<image_name param=\"" ${xml} | awk -F "\"" '{ print $2 }')
 # define name for VMware window. no utf8, perhaps we don't need it any
 # more. else change the next two lines
 #iconv -c -f utf-8 -t utf-8 < ${xml} > ${xml}.utf
-short_description=$(grep "short_description param=\"" ${xml} | sed -e "s%&.*;%; %g" | awk -F "\"" '{print $2}')
+short_description=$(grep "short_description param=\"" ${xml} | \
+  sed -e "s%&.*;%; %g" | awk -F "\"" '{print $2}')
 # if ${short_description} not defined use ${image_name}
 short_description=${short_description:-"${image_name}"}
 displayname=${short_description}
@@ -38,23 +37,6 @@ vmostype=$(grep -i "<os param=\"" ${xml} | awk -F "\"" '{ print $2 }')
 network_kind=$(grep -i "<network param=\"" ${xml} | awk -F "\"" '{ print $2 }')
 
 
-
-################################################################################
-##
-## Put $HOME to another location
-##
-################################################################################
-
-# We need to change $HOME so it saves everything to /tmp
-#export HOME="/tmp/${USER}"
-# following mkdir we have now twice in this script... but better twice
-# as not seperated. Now its no problem to delete this
-# "Put $HOME to another location" section later
-#mkdir /tmp/${USER}
-#ln -s /home/${USER}/.Xauthority /tmp/${USER}/.Xauthority
-
-
-
 ### VARIABLES SECTION ##########################################################
 ##
 ## declaration of default variables
@@ -468,6 +450,9 @@ if [ "${totalmem}" -ge "2500" ]; then
   confdir=/dev/shm/vmware/$USER
   conffile=${confdir}/run-vmware.conf
   mkdir -p /dev/shm/vmware/$USER
+# if there is no scratch space on disk you have to waste your mem
+elif grep -qe "ramfs /tmp " /proc/mounts ; then
+  permem=30
 fi
 
 # calculate memory for vmplayer
diff --git a/os-plugins/plugins/vmware/files/runvmware-player-v25 b/os-plugins/plugins/vmware/files/runvmware-player-v25
index 391c0639..c05e5dea 100644
--- a/os-plugins/plugins/vmware/files/runvmware-player-v25
+++ b/os-plugins/plugins/vmware/files/runvmware-player-v25
@@ -28,7 +28,8 @@ imagename=$(grep -i "<image_name param=\"" ${xml} | awk -F "\"" '{ print $2 }')
 # define name for VMware window. no utf8, perhaps we don't need it any
 # more. else change the next two lines
 #iconv -c -f utf-8 -t utf-8 < ${xml} > ${xml}.utf
-short_description=$(grep "short_description param=\"" ${xml} | sed -e "s%&.*;%; %g" | awk -F "\"" '{print $2}')
+short_description=$(grep "short_description param=\"" ${xml} | \
+  sed -e "s%&.*;%; %g" | awk -F "\"" '{print $2}')
 # if ${short_description} not defined use ${image_name}
 short_description=${short_description:-"${image_name}"}
 displayname=${short_description}
@@ -56,22 +57,6 @@ case "$serial" in
     ;;
 esac
 
-################################################################################
-##
-## Put $HOME to another location
-##
-################################################################################
-
-# We need to change $HOME so it saves everything to /tmp
-#export HOME="/tmp/${USER}"
-# following mkdir we have now twice in this script... but better twice
-# as not seperated. Now its no problem to delete this
-# "Put $HOME to another location" section later
-#mkdir /tmp/${USER}
-#ln -s /home/${USER}/.Xauthority /tmp/${USER}/.Xauthority
-
-
-
 ### VARIABLES SECTION ##########################################################
 ##
 ## declaration of default variables
diff --git a/os-plugins/plugins/xserver/files/nvidia-install.sh b/os-plugins/plugins/xserver/files/nvidia-install.sh
index 6862ac83..55bc8188 100755
--- a/os-plugins/plugins/xserver/files/nvidia-install.sh
+++ b/os-plugins/plugins/xserver/files/nvidia-install.sh
@@ -45,10 +45,14 @@ case ${DISTRO} in
    kernel=2.6.25.18-0.2-pae
    echo "  * Trying to compile a kernel module for $kernel"
    echo "Starting the kernel $kernel installer" >>nvidia-inst.log
+   # we need the .config file in /usr/src/linux or where ever!
+   # we need scripts/genksyms/genksyms compiled via make scripts in /usr/src/linux
+   # option available in newer nvidia packages
+   addopts="--no-cc-version-check"
    $(ls -d NVIDIA-Linux-*)/nvidia-installer -s -q -N -K --no-abi-note \
      --kernel-source-path=/lib/modules/${kernel}/build -k ${kernel} \
      --kernel-install-path=/opt/openslx/plugin-repo/xserver/nvidia/modules \
-     --no-runlevel-check  --no-abi-note --no-rpms --no-cc-version-check \
+     --no-runlevel-check --no-abi-note --no-rpms ${addopts} \
      --log-file-name=nvidia-kernel.log >>nvidia-inst.log 2>&1
    echo "  * Have a look into the several *.log files in "
    echo "    stage1/${DISTRO}/plugin-repo/xserver"