Some more cleanup for the last runvmware script. A heavy rewrite is

required nevertheless ...


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

1 files changed, 5 insertions, 22 deletions

diff --git a/os-plugins/plugins/vmware/files/runvmware-player-v2 b/os-plugins/plugins/vmware/files/runvmware-player-v2
index a51e80c0..9fdaaf85 100644
--- a/os-plugins/plugins/vmware/files/runvmware-player-v2
+++ b/os-plugins/plugins/vmware/files/runvmware-player-v2
@@ -26,7 +26,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 +39,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
@@ -418,10 +402,6 @@ writelog ()
 }
 
 
-
-
-
-
 ### MAIN SECTION ###############################################################
 ##
 ## Main part of the script...
@@ -479,6 +459,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