diff options
author | Simon Rettberg | 2013-07-04 17:29:19 +0200 |
---|---|---|
committer | Simon Rettberg | 2013-07-04 17:29:19 +0200 |
commit | 47733a7f2f1ac3e07795c56a11cdf4019628e6bc (patch) | |
tree | d99c1b0d00559d34370339cb6b6ebb76c28b8aad /remote | |
parent | Added locale-Vars besides LANG (LC_*) per add_env to environment: (diff) | |
download | tm-scripts-47733a7f2f1ac3e07795c56a11cdf4019628e6bc.tar.gz tm-scripts-47733a7f2f1ac3e07795c56a11cdf4019628e6bc.tar.xz tm-scripts-47733a7f2f1ac3e07795c56a11cdf4019628e6bc.zip |
[vmchooser] Create text file in floppy image that tells the guest the host's resolution
[vmplayer] do not override enable3d setting from xml when system supports 3d
Diffstat (limited to 'remote')
-rwxr-xr-x | remote/modules/vmchooser/data/opt/openslx/bin/run-virt.sh | 31 | ||||
-rw-r--r-- | remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include | 1 |
2 files changed, 3 insertions, 29 deletions
diff --git a/remote/modules/vmchooser/data/opt/openslx/bin/run-virt.sh b/remote/modules/vmchooser/data/opt/openslx/bin/run-virt.sh index 826bfecd..eacb8837 100755 --- a/remote/modules/vmchooser/data/opt/openslx/bin/run-virt.sh +++ b/remote/modules/vmchooser/data/opt/openslx/bin/run-virt.sh @@ -365,30 +365,6 @@ hddrv="ide" audio="true" remotedesktopport="590${VM_ID}" -# Display resolution within the host system -hostres=$(xvidtune -show 2>/dev/null| grep -ve "^$") -xres=$(echo "${hostres}" | awk '{print $3}') -yres=$(echo "${hostres}" | awk '{print $7}') - -# Resolution defined via xml parameter: fullscreen, full/X*Y/depth; windowed, -# win/X*Y/depth -userres=$(grep -io '<screen param=.*"' ${xmlfile} | awk -F '"' '{ print $2 }' | \ - tr "A-Z" "a-z") -case "${userres}" in - full*) - res=$(echo "${hostres}" | awk -F "/" '{print $2}') - uxres=${res%\**} - uyres=${#*\*} - userres="full" - ;; - win*) - res=$(echo "${hostres}" | awk -F "/" '{print $2}') - uxres=${res%\**} - uyres=${#*\*} - userres="win" - ;; -esac - # Enable 3D enable3d=$(grep -i "<enable3d param=.*" ${xmlfile} 2>/dev/null | \ @@ -429,10 +405,9 @@ fi # Copy guest configuration (with added information) config.xml to be accessed # via virtual floppy -# fixme -> to be changed (vmchooser adapts the file content!?) -#TODO: wozu echo? -#echo "Please fix the config.xml generation" -cp ${xmlfile} /etc/openslx/vmchooser/fd-loop/config.xml +cp "$xmlfile" "/etc/openslx/vmchooser/fd-loop/config.xml" +# Add another file with resolution information +xrandr | grep -o -E 'current\s*[0-9]+\s*x\s*[0-9]+' | cut -c 8- | sed -r 's/(\s|\t|\n)//g' | head -1 > "/etc/openslx/vmchooser/fd-loop/hostres.txt" # Get all virtual machine specific stuff from the respective include file if [ -e /etc/openslx/${xmlvirt}/run-virt.include ] ; then diff --git a/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include b/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include index 9b0fea91..45ff2d72 100644 --- a/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include +++ b/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include @@ -351,7 +351,6 @@ esac local FORCE3D="" if [ -n "$SLX_VMWARE_3D" ]; then FORCE3D='mks.gl.allowBlacklistedDrivers = "TRUE"' - enable3d="TRUE" fi # serial/parallel port defined (e.g. "ttyS0, lp0" or "autodetect") |