From aba3465b5ffd5637ef48ec27dabb0a92c2530cfc Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 30 Jul 2013 16:55:55 +0200
Subject: [vmplayer] fix memory limit on old vmware hardware versions
 [rootfs-stage32] make analyze-disk wait for fdisk

---
 remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include | 3 ++-
 remote/rootfs/rootfs-stage32/data/opt/openslx/bin/analyse-disk   | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'remote')

diff --git a/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include b/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include
index 5ac0454a..71d294cb 100644
--- a/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include
+++ b/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include
@@ -195,7 +195,8 @@ runvmwareconfheader ()
 		ENABLE_SHARE=''
 	fi
 	
-	[ "${mem}" -ge "$MAXMEM" ] && mem="$MAXMEM"
+	[ "$mem" -ge "$MAXMEM" ] && mem="$MAXMEM"
+	[ "$hwver" -lt "7" -a "$mem" -gt "3500" ] && mem="3500"
 	
 	cap3d="WHAT IS THIS VAR USED FOR?"                    # helper var for loging output
 	
diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/analyse-disk b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/analyse-disk
index 978b341b..f162ec3a 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/analyse-disk
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/analyse-disk
@@ -52,7 +52,13 @@ done
 }
 
 # Check for local harddisks and appropriate partitions
-fdisk -l | sed -n "/^\/dev\//p" > "/etc/disk.partition"
+for waiting in 1 1 2 3 4; do
+	fdisk -l | sed -n "/^\/dev\//p" > "/etc/disk.partition"
+	[ -s "/etc/disk.partition" ] && break
+	sleep "$waiting"
+done
+echo "Partitions:"
+cat "/etc/disk.partition"
 
 # Check for standard swap partitions and make them available to the system
 for hdpartnr in $(sed -n -e "/ 82 /p" "/etc/disk.partition" | sed -e "s/[[:space:]].*//"); do
-- 
cgit v1.2.3-55-g7522