diff options
Diffstat (limited to 'core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc')
| -rw-r--r-- | core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc | 21 |
1 files changed, 8 insertions, 13 deletions
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 f589d2b6..fd62005f 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,24 +105,19 @@ setup_virtual_floppy() { SHARE_NO_HOME_WARN=0 fi - # Legacy: openslx.exe expects HOSTRES.TXT - local RESOLUTION=$(xrandr | grep -o -E 'connected\s*(primary)?\s*[0-9]+x[0-9]+\+0\+0' \ - | grep -o -E -m1 '[0-9]+x[0-9]+') - cat > "${FLOPPYDIR}/HOSTRES.TXT" <<-EOF - ${RESOLUTION} - EOF - - ( - echo '[openslx]' + 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" = "vmware" ] || [ "$PLUGIN_ID" = "virtualbox" -a "$DISPLAY_COUNT" -eq 1 ]; then - echo "resolution=$RESOLUTION" + if [ "$PLUGIN_ID" != "virtualbox" ] || [ "$DISPLAY_COUNT" -eq 1 ]; then + resolution="${RESOLUTIONS}" fi - cat <<-EOF + + cat > "${FLOPPYDIR}/openslx.ini" <<-EOF + [openslx] username=${UNAME} + resolution=${resolution} createMissingRemap=${SHARE_CREATE_MISSING_REMAP} remapMode=${SHARE_REMAP_MODE_INI} homeDrive=${SHARE_HOME_DRIVE} @@ -140,7 +135,7 @@ setup_virtual_floppy() { media=${SHARE_MEDIA} other=${SHARE_OTHER} EOF - ) > "${FLOPPYDIR}/openslx.ini" + ln -n -s "${VMCHOOSER_DIR}/data/openslx.exe" "${FLOPPYDIR}/openslx.exe" # If we have a kerberos ticket, copy that one too (TODO: Copy keytab too?) if [ -n "$KRB5CCNAME" ]; then |