summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2017-10-26 12:59:35 +0200
committerSimon Rettberg2017-10-26 12:59:35 +0200
commitea5edd205243b07c838bd67c3808feb82b36331f (patch)
treee54610fefb159d59519304c30d1738680df9d8f6
parent[dnbd3-proxy-mode] Exclude own ip addresses from alt-servers (diff)
downloadmltk-ea5edd205243b07c838bd67c3808feb82b36331f.tar.gz
mltk-ea5edd205243b07c838bd67c3808feb82b36331f.tar.xz
mltk-ea5edd205243b07c838bd67c3808feb82b36331f.zip
[vmware] Update to 14.0.0
-rwxr-xr-xcore/modules/vmware/data/opt/openslx/bin/vmplayer13
-rw-r--r--core/modules/vmware/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc4
-rw-r--r--core/modules/vmware/module.conf3
3 files changed, 10 insertions, 10 deletions
diff --git a/core/modules/vmware/data/opt/openslx/bin/vmplayer b/core/modules/vmware/data/opt/openslx/bin/vmplayer
index cfb91a0a..05a4ec3a 100755
--- a/core/modules/vmware/data/opt/openslx/bin/vmplayer
+++ b/core/modules/vmware/data/opt/openslx/bin/vmplayer
@@ -5,13 +5,12 @@ PREFIX=/usr/lib/vmware # depends on the vmware location
# HACK: Let the OpenGL driver report s3tc capability even if not present, so 3D will be enabled
export force_s3tc_enable=true
-PROG=$(basename $0)
-
-exec "$PREFIX/lib/wrapper-gtk24.sh" \
- "$PREFIX/lib" \
- "$PREFIX/bin/$PROG" \
- "$PREFIX/libconf" "$@"
-
+# Turn off "helpful" DE features
+export APPMENU_DISPLAY_BOTH=1
+export UBUNTU_MENUPROXY=0
+export GNOME_DISABLE_CRASH_DIALOG=1
+PROG=$(basename $0)
+exec "$PREFIX/bin/$PROG" "$@"
diff --git a/core/modules/vmware/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc b/core/modules/vmware/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc
index 84ddee1d..a431560f 100644
--- a/core/modules/vmware/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc
+++ b/core/modules/vmware/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc
@@ -50,8 +50,8 @@ setup_floppies() {
# Floppies:
cat >> "${TMPCONFIG}" <<-HEREEND
- floppy0.present = "$FLOPPY0"
- floppy0.startConnected = "FALSE"
+ floppy0.present = "TRUE"
+ floppy0.startConnected = "$FLOPPY0"
floppy0.autodetect = "TRUE"
floppy0.fileName = "auto detect"
floppy1.present = "$SLX_FLOPPY"
diff --git a/core/modules/vmware/module.conf b/core/modules/vmware/module.conf
index 89a85db2..af90cd55 100644
--- a/core/modules/vmware/module.conf
+++ b/core/modules/vmware/module.conf
@@ -1,5 +1,5 @@
#!/bin/bash
-REQUIRED_VERSION="12.5.7"
+REQUIRED_VERSION="14.0.0"
REQUIRED_TYPE="workstation"
REQUIRED_MODULES="kernel"
REQUIRED_DIRECTORIES="
@@ -12,6 +12,7 @@ REQUIRED_DIRECTORIES="
/usr/lib/vmware/libconf
/usr/lib/vmware/licenses
/usr/lib/vmware/resources
+ /usr/lib/vmware/roms
/usr/lib/vmware/scripts
/usr/lib/vmware/share
/usr/lib/vmware/xkeymap