summaryrefslogtreecommitdiffstats
path: root/core/modules/run-virt/data/opt/openslx
diff options
context:
space:
mode:
authorSimon Rettberg2020-08-18 15:19:41 +0200
committerSimon Rettberg2020-08-18 15:19:41 +0200
commit2128d62a24a1f2a13303296c50de72f4c86ef507 (patch)
tree234567d978d75e6b36f7b260b0ac9e3aa7aec88d /core/modules/run-virt/data/opt/openslx
parent[run-virt] Only restart WM if a different one is requested (diff)
downloadmltk-2128d62a24a1f2a13303296c50de72f4c86ef507.tar.gz
mltk-2128d62a24a1f2a13303296c50de72f4c86ef507.tar.xz
mltk-2128d62a24a1f2a13303296c50de72f4c86ef507.zip
[run-virt] openslx.exe: Multi-screen support via WinAPI
Improved retry logic for multi-screen setup. openslx.ini hack for VirtualBox has now been removed.
Diffstat (limited to 'core/modules/run-virt/data/opt/openslx')
-rwxr-xr-xcore/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exebin59904 -> 60416 bytes
-rw-r--r--core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc13
2 files changed, 2 insertions, 11 deletions
diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe b/core/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe
index ceaa3159..eb04d9e6 100755
--- a/core/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe
+++ b/core/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe
Binary files differ
diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc
index 703d2cd0..54f60e16 100644
--- a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc
+++ b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc
@@ -105,20 +105,11 @@ setup_virtual_floppy() {
SHARE_NO_HOME_WARN=0
fi
- local resolution=
- # Ugly hack for multi-monitor support with virtualbox.
- # The guest additions properly set up the resolutions of multiple
- # monitor, thus we need to disable the resolution feature of
- # the openslx.exe as it would break what virtualbox did.
- if [ "$PLUGIN_ID" != "virtualbox" ] || [ "$DISPLAY_COUNT" -eq 1 ]; then
- resolution="${RESOLUTIONS}"
- fi
-
cat > "${FLOPPYDIR}/openslx.ini" <<-EOF
[openslx]
username=${UNAME}
- resolution=${resolution%% *}
- resolution2=${resolution}
+ resolution=${RESOLUTIONS%% *}
+ resolution2=${RESOLUTIONS}
createMissingRemap=${SHARE_CREATE_MISSING_REMAP}
remapMode=${SHARE_REMAP_MODE_INI}
homeDrive=${SHARE_HOME_DRIVE}