Add installer mode for stage4

2 files changed, 23 insertions, 1 deletions

diff --git a/core/modules/vmware12/data/addon-required b/core/modules/vmware12/data/addon-required
new file mode 100644
index 00000000..6261292c
--- /dev/null
+++ b/core/modules/vmware12/data/addon-required
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# the vmware helper needs the kmod msr and the tool rdmsr,
+# /dev, /sys and /proc to properly detect the CPU info.
+
+bindmount=("/dev" "/proc" "/sys")
+
+for bm in "${bindmount[@]}"; do
+	mount --bind "$bm" "${NEWROOT}/${bm}"
+done
+
+export PATH="$PATH:/opt/openslx/sbin:/opt/openslx/bin"
+version="$(chroot "$NEWROOT" vmware-get-supported-version)"
+
+for bm in "${bindmount[@]}"; do
+	umount "${NEWROOT}/${bm}"
+done
+
+[ -n "$version" ] && [ "$version" = "legacy" ]
diff --git a/core/modules/vmware12/data/opt/openslx/bin/vmplayer b/core/modules/vmware12/data/opt/openslx/bin/vmplayer
index f94c8794..afac3c94 100755
--- a/core/modules/vmware12/data/opt/openslx/bin/vmplayer
+++ b/core/modules/vmware12/data/opt/openslx/bin/vmplayer
@@ -9,7 +9,10 @@ PROG=$(basename $0)
 
 # various hacks to help vmplayer find its own libs -.-
 export VMWARE_USE_SHIPPED_LIBS=force
-export LD_LIBRARY_PATH=$( find /usr/lib/vmware/lib/ -maxdepth 1 -mindepth 1 -type d | awk 'BEGIN{p=""}{p=p$0":"}END{print p}' )
+export LD_LIBRARY_PATH=$( \
+	find /usr/lib/vmware/lib/ -maxdepth 1 -mindepth 1 -type d \
+	| grep -v libfontconfig \
+	| awk 'BEGIN{p=""}{p=p$0":"}END{print p}' )
 
 exec "$PREFIX/lib/wrapper-gtk24.sh" \
      "$PREFIX/lib" \