diff options
| author | Manuel Schneider | 2013-10-01 14:38:48 +0200 |
|---|---|---|
| committer | Manuel Schneider | 2013-10-01 14:38:48 +0200 |
| commit | ec77168d47976b0b6a026aec7dede003604454e4 (patch) | |
| tree | d45408266e5e5df6db56d44c4a68fcd0b9ab5213 /remote/modules/vmchooser | |
| parent | [vmchooser] Make sure Qt4 is used, only patch source if not already patched (diff) | |
| parent | [vmchooser] Add windows binary that will set the resolution in the VM. The bi... (diff) | |
| download | tm-scripts-ec77168d47976b0b6a026aec7dede003604454e4.tar.gz tm-scripts-ec77168d47976b0b6a026aec7dede003604454e4.tar.xz tm-scripts-ec77168d47976b0b6a026aec7dede003604454e4.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/vmchooser')
| -rwxr-xr-x | remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/openslx.exe | bin | 0 -> 12800 bytes | |||
| -rwxr-xr-x | remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt | 2 |
2 files changed, 2 insertions, 0 deletions
diff --git a/remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/openslx.exe b/remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/openslx.exe Binary files differnew file mode 100755 index 00000000..e016f407 --- /dev/null +++ b/remote/modules/vmchooser/data/opt/openslx/etc/vmchooser/openslx.exe diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt index 7e594747..b0d01738 100755 --- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt +++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt @@ -432,6 +432,8 @@ fi cp "$xmlfile" "/opt/openslx/etc/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 -n 1 > "/opt/openslx/etc/vmchooser/fd-loop/hostres.txt" +# Add our magic openslx binary that sets the correct guest resolution +cp "/opt/openslx/etc/vmchooser/openslx.exe" "/opt/openslx/etc/vmchooser/fd-loop/" # Try to use dnbd3 to access the image unset vm_diskfile |