optimized configuration for vmplayer2.5

to be tested, but seems ok so far

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

2 files changed, 134 insertions, 137 deletions

diff --git a/os-plugins/plugins/vmware/XX_vmware.sh b/os-plugins/plugins/vmware/XX_vmware.sh
index 2e714cda..000b9e5d 100644
--- a/os-plugins/plugins/vmware/XX_vmware.sh
+++ b/os-plugins/plugins/vmware/XX_vmware.sh
@@ -226,6 +226,11 @@ $(ipcalc -m $vmip/$vmpx|sed s/.*=//) {" \
     echo -e "\tmount -t usbfs usbfs /proc/bus/usb 2>/dev/null" \
       >>/mnt/etc/init.d/boot.slx
 
+    # disable VMware swapping 
+    echo '.encoding = "UTF-8"
+    prefvmx.useRecommendedLockedMemSize = "TRUE"
+    prefvmx.minVmMemPct = "100"' \
+    >/etc/vmware/config
 
     ## Copy version depending files
     cp /mnt/opt/openslx/plugin-repo/vmware/${vmware_kind}/runvmware \
diff --git a/os-plugins/plugins/vmware/files/runvmware-player-v25 b/os-plugins/plugins/vmware/files/runvmware-player-v25
index 7fb18630..41c2ad09 100644
--- a/os-plugins/plugins/vmware/files/runvmware-player-v25
+++ b/os-plugins/plugins/vmware/files/runvmware-player-v25
@@ -9,7 +9,7 @@
 #               last changes mj0, 17/10/2008
 # Copyright:    (c) 2003 - 2008 - RZ Universitaet Freiburg
 #
-# Version:      0.18.1
+# Version:      0.19
 #
 ################################################################################
 
@@ -116,7 +116,7 @@ vmhome="${HOME}/.vmware"
 # config and hardware version ex. 8/6 for VMware6.5
 # will be replaced automatically during run of vmware/player
 confver=8
-hver=4
+hver=7
 
 # set hostname: using original hostname and adding string "-vm"
 # variable isn't used anywhere in this script. but still works (however)
@@ -253,103 +253,97 @@ filecheck ()
 ### write run-vmware.conf #######################################################
 runvmwareconfheader ()
 {
-  echo "
-  ##############################################################################
-  ###### This configuration file was generated by run-vmware.sh,          ######
-  ###### dont use it for your own configurations - it will be overwritten ######
-  ######                                                                  ######
-
-  ###### identity ##############################################################
-  displayName = \"${displayname}\"
-  guestOS = \"${vmostype}\"
-  config.version = \"${confver}\"
-  virtualHW.version = \"${hver}\"
-
-  memsize = \"${mem}\"
-  numvcpus = \"1\"
-
-  ###### ide-disks #############################################################
-  ide0:0.mode = \"${np}\"
-  ide0:0.present = \"${ide}\"
-  ide0:0.fileName = \"${diskfile}\" 
-
-  ide1:0.present = \"${cdr_1}\"
-  ide1:0.autodetect = \"TRUE\"
-  ide1:0.fileName = \"auto detect\"
-  ide1:0.deviceType = \"cdrom-raw\"
-
-  ide1:1.present = \"${cdr_2}\"
-  ide1:1.autodetect = \"TRUE\"
-  ide1:1.fileName = \"auto detect\"
-  ide1:1.deviceType = \"cdrom-raw\"
-
-  ###### scsi-disks ############################################################
-  scsi0.present = \"${scsi}\"
-  scsi0.virtualDev = \"lsilogic\"
-  scsi0:0.mode = \"${np}\"
-  scsi0:0.present = \"${scsi}\"
-  scsi0:0.fileName = \"${diskfile}\"
-
-  ###### nics ##################################################################
-  ethernet0.present = \"TRUE\"
-  ethernet0.addressType = \"static\"
-  ethernet0.connectionType = \"${network_kind}\"
-  ethernet0.address = \"00:50:56:0D:${mac}\"
-
-  ###### sound #################################################################
-  sound.present = \"TRUE\"
-  sound.virtualDev = \"es1371\"
-
-  ###### usb ###################################################################
-  usb.present = \"TRUE\"
-  ehci.present= \"TRUE\"
-  usb.generic.autoconnect = \"TRUE\"
-
-  ###### floppies ##############################################################
-  floppy0.present = \"${floppya}\"
-  floppy0.fileName = \"auto detect\"
-
-  # we need floppy b: this for our windows client configuration
-  floppy1.present = \"${floppyb}\"
-  floppy1.fileType = \"file\"
-  floppy1.fileName = \"${floppybname}\"
-  floppy1.startConnected = \"TRUE\"
-
-  ###### ports #################################################################
-  parallel0.present = \"FALSE\"
-
-  serial0.present = \"FALSE\"
-
-  ###### shared folders ########################################################
-  sharedFolder0.present = \"TRUE\"
-  sharedFolder0.enabled = \"TRUE\"
-  sharedFolder0.expiration = \"never\"
-  sharedFolder0.guestName = \"Home\"
-  sharedFolder0.hostPath = \"${HOME}\"
-  sharedFolder0.readAccess = \"TRUE\"
-  sharedFolder0.writeAccess = \"TRUE\"
-  sharedFolder.maxNum = \"1\"
-
-  ###### misc ##################################################################
-  tmpDirectory = \"${redodir}\"
-  mainMem.useNamedFile = \"TRUE\"
-  snapshot.disabled = \"TRUE\"
-  tools.syncTime = \"TRUE\"
-  redoLogDir = \"${redodir}\"
-  hints.hideAll = \"TRUE\"
-  logging = \"FALSE\"
-  isolation.tools.hgfs.disable = \"FALSE\"
-  isolation.tools.dnd.disable = \"TRUE\"
-  isolation.tools.copy.enable = \"TRUE\"
-  isolation.tools.paste.enabled = \"TRUE\"
-  gui.restricted = \"TRUE\"
-  pref.hotkey.shift = \"TRUE\"
-  pref.hotkey.control = \"TRUE\"
-  pref.hotkey.alt = \"TRUE\"
-  svga.maxWidth = \"${xres}\"
-  svga.maxHeight = \"${yres}\"
-  svga.autodetect = \"TRUE\"
-  " \
+  echo ".encoding = \"UTF-8\"
+# This configuration file was generated by $0
+
+# id
+displayName = \"${displayname}\"
+guestOS = \"${vmostype}\"
+config.version = \"${confver}\"
+virtualHW.version = \"${hver}\"
+
+# CPU/MEM
+memsize = \"${mem}\"
+MemAllowAutoScaleDown = \"FALSE\"
+MemTrimRate = \"-1\"
+numvcpus = \"1\"
+
+# ide-disks
+ide0:0.present = \"${ide}\"
+ide0:0.fileName = \"${diskfile}\"
+ide0:0.mode = \"${np}\"
+ide1:0.present = \"${cdr_1}\"
+ide1:0.autodetect = \"TRUE\"
+ide1:0.fileName = \"auto detect\"
+ide1:0.deviceType = \"cdrom-raw\"
+ide1:1.present = \"${cdr_2}\"
+ide1:1.autodetect = \"TRUE\"
+ide1:1.fileName = \"auto detect\"
+ide1:1.deviceType = \"cdrom-raw\"
+
+# scsi-disks
+scsi0.present = \"${scsi}\"
+scsi0:0.present = \"${scsi}\"
+scsi0:0.fileName = \"${diskfile}\"
+scsi0.virtualDev = \"lsilogic\" #\"${hddrv}\"
+scsi0:0.mode = \"${np}\"
+
+# floppies
+floppy0.present = \"${floppya}\"
+floppy0.startConnected = \"FALSE\"
+floppy0.autodetect = \"TRUE\"
+floppy0.fileName = \"auto detect\"
+# we need floppy b: for our windows client configuration
+floppy1.present = \"${floppyb}\"
+floppy1.startConnected = \"TRUE\"
+floppy1.fileType = \"file\"
+floppy1.fileName = \"${floppybname}\"
+
+# nics
+ethernet0.present = \"TRUE\"
+ethernet0.addressType = \"static\"
+#ethernet0.virtualDev = \"e1000\"
+ethernet0.connectionType = \"${network_kind}\"
+ethernet0.address = \"00:50:56:0D:${mac}\"
+ethernet0.wakeOnPcktRcv = \"FALSE\"
+
+# usb
+usb.present = \"TRUE\"
+ehci.present= \"TRUE\"
+
+# graphics
+svga.autodetect = \"TRUE\"
+mks.enable3d = \"TRUE\"
+
+# sound
+sound.present = \"TRUE\"
+sound.fileName = \"-1\"
+sound.autodetect = \"TRUE\"
+
+# shared folders
+sharedFolder.option = \"alwaysEnabled\"
+sharedFolder0.present = \"TRUE\"
+sharedFolder0.enabled = \"TRUE\"
+sharedFolder0.expiration = \"never\"
+sharedFolder0.guestName = \"Home\"
+sharedFolder0.hostPath = \"${HOME}\"
+sharedFolder0.readAccess = \"TRUE\"
+sharedFolder0.writeAccess = \"TRUE\"
+sharedFolder.maxNum = \"1\"
+
+# dirs/configs
+tmpDirectory = \"${redodir}\"
+redoLogDir = \"${redodir}\"
+mainMem.useNamedFile = \"TRUE\"
+snapshot.disabled = \"TRUE\"
+tools.syncTime = \"TRUE\"
+hints.hideAll = \"TRUE\"
+isolation.tools.hgfs.disable = \"FALSE\"
+hgfs.mapRootShare = \"TRUE\"
+isolation.tools.dnd.disable = \"FALSE\"
+isolation.tools.copy.enable = \"TRUE\"
+isolation.tools.paste.enabled = \"TRUE\"
+gui.restricted = \"TRUE\"" \
   >${conffile}
 
   # set the appropriate permissions for the vmware config file
@@ -360,44 +354,42 @@ runvmwareconfheader ()
 ### creates user configurationfile in ${vmhome} ################################
 preferencesheader ()
 {
-  echo "
-  ##############################################################################
-  ###### This configuration file was generated by run-vmware.sh,          ######
-  ###### dont use it for your own configurations - it will be overwritten ######
-  ######                                                                  ######
-  ################################## Wichtig! ##################################
-  ###### *.vmem wird immer angelegt und frisst soviel Speicher, wie fuer  ######
-  ###### den Gast vorgesehen. Sollte nicht im tempfs liegen. NFS OK, da   ######
-  ###### IO nur einmal beim Start erheblich. Wird gesteuert ueber         ######
-  ###### confdir=/nfs-viel-platz                                          ######
-
-  # DEBUG: some versions accept it only upper or lowercase... which one?
-  # The following 4 could also be uppercase
-  hints.hideAll = \"true\"
-  pref.exchangeSelections = \"true\"
-  pref.hotkey.shift = \"true\"
-  pref.tip.startup = \"false\"
-  pref.vmplayer.exit.vmAction = \"poweroff\"
-  # DEBUG: some versions accept it only upper or lowercase... which one?
-  # The following 2 could also be uppercase
-  pref.vmplayer.fullscreen.autohide = \"true\"
-  pref.vmplayer.webUpdateOnStartup = \"false\"
-  prefvmx.defaultVMPath = \"${vmhome}\"
-  prefvmx.mru.config = \"${conffile}:\"
-  tmpDirectory = \"${redodir}\"
-  webUpdate.checkPeriod = \"manual\"
-  pref.eula.size = \"2\"
-  pref.eula.0.appName = \"VMware Player\"
-  pref.eula.0.buildNumber = \"${vmbuild}\"
-  pref.eula.1.appName = \"VMware Workstation\"
-  pref.eula.1.buildNumber = \"${vmbuild}\"
-  pref.enableAllSharedFolders = \"TRUE\"
-  sharedFolder0.enabled = \"TRUE\"
-  pref.grabOnKeyPress = \"TRUE\"
-  pref.autoFitFullScreen = \"fitHostToGuest\"
-  pref.autoFitGuestToWindow = \"TRUE\"
-  pref.grabOnMouseClick = \"TRUE\"
-  " \
+  echo ".encoding = \"UTF-8\"
+# This configuration file was generated by $0
+
+# updates/tips
+webUpdate.enabled = \"FALSE\"
+pref.vmplayer.webUpdateOnStartup = \"FALSE\"
+pref.tip.startup = \"FALSE\"
+
+# configs
+prefvmx.defaultVMPath = \"${vmhome}\"
+prefvmx.mru.config = \"${conffile}:\"
+
+# hot keys
+pref.hotkey.shift = \"true\"
+pref.hotkey.gui = \"true\"
+
+# fullscreen/mouse/keyboard
+pref.fullscreen.toolbarPixels = \"0\"
+pref.vmplayer.fullscreen.autohide = \"TRUE\"
+pref.grabOnMouseClick = \"TRUE\"
+pref.motionGrab = \"TRUE\"
+pref.motionUngrab = \"TRUE\"
+pref.hideCursorOnUngrab = \"TRUE\"
+pref.autoFit = \"TRUE\"
+pref.autoFitFullScreen = \"fitGuestToHost\"
+pref.vmplayer.exit.vmAction = \"poweroff\"
+
+# shared folders
+pref.enableAllSharedFolders = \"TRUE\"
+
+# eula
+pref.eula.size = \"2\"
+pref.eula.0.appName = \"VMware Player\"
+pref.eula.0.buildNumber = \"${vmbuild}\"
+pref.eula.1.appName = \"VMware Workstation\"
+pref.eula.1.buildNumber = \"${vmbuild}\"" \
   >${vmhome}/preferences
 }