BINPATH added to PATH

support for vmplayer3
further simplifications through DEFAULTDIRS

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

1 files changed, 38 insertions, 16 deletions

diff --git a/os-plugins/plugins/vmware/files/run-virt.include b/os-plugins/plugins/vmware/files/run-virt.include
index a148442c..e3da346e 100644
--- a/os-plugins/plugins/vmware/files/run-virt.include
+++ b/os-plugins/plugins/vmware/files/run-virt.include
@@ -18,7 +18,7 @@
 # include default directories
 . /etc/opt/openslx/openslx.conf
 # include general configuration from vmchooser
-. /etc/opt/openslx/run-virt.include
+. ${OPENSLX_DEFAULT_CONFDIR}/plugins/vmchooser/run-virt.include
 
 
 # configuration writer functions
@@ -29,31 +29,51 @@ runvmwareconfheader ()
 echo "# This configuration file was generated by $0" >${conffile}
 
 case "$vmversion" in
-  1.0|5.5)
+  *)
+    svga_autodetect="TRUE"
+    numvcpus="1"
     shared_folder="FALSE"
-    echo "
-# version specific stuff
+    echo ".encoding = \"UTF-8\"
+# version specific stuff - all versions
 config.version = \"8\"" >>${conffile}
   ;;
-  2.0|6.0)
+esac
+case "$vmversion" in
+  2.*|3.*|6.*|7.*)
     shared_folder="TRUE"
     echo "
-# version specific stuff
-config.version = \"8\"
+# version specific stuff - ver. 2.*|3.*|6.*|7.*
 sharedFolder.option = \"alwaysEnabled\"" >>${conffile}
   ;;
-  2.5|6.5)
-    shared_folder="TRUE"
-    cap3d="TRUE"
+esac
+case "$vmversion" in
+  2.5|3.*|6.5|7.*)
+    cap3d="TRUE"                    # helper var for loging output
     echo "
-# version specific stuff
-config.version = \"8\"
+# version specific stuff - ver. 2.5|3.*|6.5|7.*
 pref.hotkey.gui = \"true\"
 ehci.present = \"TRUE\"
-sharedFolder.option = \"alwaysEnabled\"
 mks.enable3d = \"${enable3d}\"" >>${conffile}
   ;;
 esac
+case "$vmversion" in
+ 3.*|7.*)
+    nunumvcpus=$(expr ${cpu_cores} \* ${cpu_cores})
+    # svga_autodetect="FALSE"       # if defined manual, see below
+    echo "
+# version specific stuff - ver. 3.*|7.*
+cpuid.coresPerSocket = \"${cpu_cores}\"
+maxvcpus = \"4\"
+# svga.numDisplays = "2"
+# svgy.maxWidth = "2560"
+# svga.maxHeight = "2048"
+# svga.vramSize = "134217728"
+monitor.virtual_mmu = \"automatic\"
+monitor.virtual_exec = \"automatic\"
+floppy1.clientDevice = \"FALSE\"
+floppy1.readonly = \"TRUE\"" >>${conffile}
+  ;;
+esac
 
 echo "
 # id
@@ -62,10 +82,10 @@ displayName = \"${displayname}\"
 guestOS = \"${vmostype}\"
 
 # CPU/MEM
+numvcpus = \"${nunumvcpus}\"
 memsize = \"${mem}\"
 MemAllowAutoScaleDown = \"FALSE\"
 MemTrimRate = \"-1\"
-numvcpus = \"1\"
 
 # ide-disks
 ide0:0.present = \"${ide}\"
@@ -114,7 +134,7 @@ sound.fileName = \"-1\"
 sound.autodetect = \"TRUE\"
 
 # svga
-svga.autodetect = \"TRUE\"
+svga.autodetect = \"${svga_autodetect}\"
 
 # usb
 usb.present = \"TRUE\"
@@ -162,6 +182,7 @@ echo ".encoding = \"UTF-8\"
 
 # updates/tips
 webUpdate.enabled = \"FALSE\"
+pref.downloadPermission = \"deny\"
 pref.vmplayer.webUpdateOnStartup = \"FALSE\"
 pref.tip.startup = \"FALSE\"
 hints.hideAll = \"TRUE\"
@@ -182,6 +203,7 @@ gui.restricted = \"true\"
 pref.fullscreen.toolbarPixels = \"0\"
 pref.vmplayer.fullscreen.autohide = \"TRUE\"
 pref.grabOnMouseClick = \"TRUE\"
+pref.grabOnKeyPress = \"FALSE\"
 pref.motionGrab = \"TRUE\"
 pref.motionUngrab = \"TRUE\"
 pref.hideCursorOnUngrab = \"TRUE\"
@@ -314,7 +336,7 @@ fdtest=${floppy_0:+"TRUE"}
 # if $fdtest not set floppy0="FALSE", else "TRUE"
 floppy0=${fdtest:-"FALSE"}
 floppy1="TRUE"
-floppy1name="/var/lib/virt/vmchooser/loopimg/fd.img"
+floppy1name="${OPENSLX_DEFAULT_CONFDIR}/plugins/vmchooser/loopimg/fd.img"
 # if $cdrom_0 from run-virt.include set then cdtest="TRUE"
 cdtest=
 cdtest=${cdrom_0:+"TRUE"}