diff options
| author | Simon Rettberg | 2019-06-21 14:10:09 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2019-06-21 14:10:09 +0200 |
| commit | dca76fefe8b82eb9b288b7129ccff1a71926d171 (patch) | |
| tree | b4653893e2d1587037cc358d36cc04bd7a3d5888 /core | |
| parent | [kiosk-chromium] renamed file (diff) | |
| download | mltk-dca76fefe8b82eb9b288b7129ccff1a71926d171.tar.gz mltk-dca76fefe8b82eb9b288b7129ccff1a71926d171.tar.xz mltk-dca76fefe8b82eb9b288b7129ccff1a71926d171.zip | |
[vmware-common] Don't mess with USB settings/speed anymore
This should be handled entirely server-side now, including
exam mode.
Refs #3607
Diffstat (limited to 'core')
| -rw-r--r-- | core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc b/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc index 4643e034..58d9ad4f 100644 --- a/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc +++ b/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc @@ -133,26 +133,10 @@ setup_vcpu_ram() { } setup_usb() { - # USB fallback: Only write usb config if there's none - if ! grep -q -i "^usb\.present" "${TMPCONFIG}"; then - # Nothing found, go ahead - if [ -n "$SLX_EXAM" ]; then # TODO better handling of exam mode... - # Exam mode: Default to no USB - sed -i '/^usb\./Id' "${TMPCONFIG}" - echo 'usb.present = "FALSE"' >> "${TMPCONFIG}" - else - echo 'usb.present = "TRUE"' >> "${TMPCONFIG}" - fi - fi + # Force autoconnect sed -i '/^usb\.generic\.autoconnect/Id' "${TMPCONFIG}" echo 'usb.generic.autoconnect = "TRUE"' >> "${TMPCONFIG}" - # USB 3.0 support changes quality and has different side effects - # with every minor release of vmware. Always force 2.0 for now. - # TODO: Get it fixed by vmware? - sed -i '/^ehci\.present/Id;/^usb_xhci\.present/Id' "${TMPCONFIG}" - echo 'ehci.present = "TRUE"' >> "${TMPCONFIG}" - # See if there are any USB devices connected that we want to pass through immediately get_usb_devices 'usb.autoConnect.deviceXXXXX = "0x%VENDOR%:0x%PRODUCT%"' \ | sed -r 's/0x0+/0x/g' \ |