diff options
| author | Manuel Schneider | 2014-07-11 13:30:28 +0200 |
|---|---|---|
| committer | Manuel Schneider | 2014-07-11 13:30:28 +0200 |
| commit | daa1a73b2eee36675f2489c4c8c72557e3a8136e (patch) | |
| tree | 3968735ce7963ce3166369ffeecaea6ca9dd5b39 | |
| parent | [busybox] fix paths (diff) | |
| parent | [vmchooser/run-virt] Completely hide vmware toolbar in fullscreen (diff) | |
| download | tm-scripts-daa1a73b2eee36675f2489c4c8c72557e3a8136e.tar.gz tm-scripts-daa1a73b2eee36675f2489c4c8c72557e3a8136e.tar.xz tm-scripts-daa1a73b2eee36675f2489c4c8c72557e3a8136e.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
| -rw-r--r-- | remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient | 17 | ||||
| -rw-r--r-- | remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include | 25 |
2 files changed, 23 insertions, 19 deletions
diff --git a/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient b/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient index 54ec439e..75ba0709 100644 --- a/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient +++ b/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient @@ -1,12 +1,11 @@ -#!/bin/bash +#!/bin/ash # If the ENV var PVS has been set by vmchooser start pvsclient -if [ -n $PVS ]; then - if [ $PVS = "true" ]; then -# if [ -n $PVS_SESSIONID ]; then -# pvsclient --session-id $PVS_SESSIONID -# else - pvsclient & -# fi - fi +if [ -n "$PVS" -a "$PVS" = "true" ]; then + if [ -n "$PVS_SESSIONID" ]; then + pvsclient --session-id "$PVS_SESSIONID" & + else + pvsclient & + fi fi + diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include index be2990a3..e867a888 100644 --- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include +++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include @@ -330,6 +330,8 @@ preferencesheader () # updates/tips webUpdate.enabled = "FALSE" +webUpdate.lastCheck.status = "done_updates" +webUpdate.checkPeriod = "manual" pref.downloadPermission = "deny" pref.vmplayer.downloadPermission = "deny" pref.vmplayer.webUpdateOnStartup = "FALSE" @@ -351,13 +353,15 @@ gui.restricted = "true" # fullscreen/mouse/keyboard pref.fullscreen.toolbarPixels = "0" pref.vmplayer.fullscreen.autohide = "TRUE" +pref.vmplayer.fullscreen.nobar = 1 pref.grabOnMouseClick = "TRUE" -pref.grabOnKeyPress = "FALSE" +pref.grabOnKeyPress = "TRUE" pref.motionGrab = "TRUE" pref.motionUngrab = "TRUE" pref.hideCursorOnUngrab = "TRUE" pref.autoFit = "TRUE" pref.autoFitFullScreen = "fitGuestToHost" +pref.autoFitGuestToWindow = "TRUE" pref.vmplayer.exit.vmAction = "poweroff" pref.vmplayer.confirmOnExit = "TRUE" @@ -417,6 +421,7 @@ conffile="${confdir}/run-vmware.conf" # diskfile diskfile="${vmpath}" # users vmware config folder +[ -z "${HOME}" ] && HOME=$(getent passwd "$(whoami)" | awk -F ':' '{print $6}') vmhome="${HOME}/.vmware" # get several version infos for vmware/player @@ -442,15 +447,15 @@ fi # use different network card (default e1000, vlance, vmxnet) hostdev="/dev/vmnet1" case "${network_kind}" in - bridge|bridged) - hostdev="/dev/vmnet0" - ;; - nat) - hostdev="/dev/vmnet1" - ;; - hostonly|host-only) - hostdev="/dev/vmnet2" - ;; + bridge|bridged) + hostdev="/dev/vmnet0" + ;; + nat) + hostdev="/dev/vmnet1" + ;; + hostonly|host-only) + hostdev="/dev/vmnet2" + ;; esac # set standard sound card, overwrite depending on OS (options sb16, es1371, hdaudio) |