summaryrefslogtreecommitdiffstats
path: root/remote/modules
diff options
context:
space:
mode:
authorJonathan Bauer2013-07-30 17:17:05 +0200
committerJonathan Bauer2013-07-30 17:17:05 +0200
commit04ce2e1d262ff45a690c08e285638526ea35e785 (patch)
treecd23d8eda0c4ebd5fa5b871337da889a9c374fc0 /remote/modules
parent[rootfs-stage32] mount tmp partition after sysinit target, not before (diff)
parent[vmplayer] fix memory limit on old vmware hardware versions (diff)
downloadtm-scripts-04ce2e1d262ff45a690c08e285638526ea35e785.tar.gz
tm-scripts-04ce2e1d262ff45a690c08e285638526ea35e785.tar.xz
tm-scripts-04ce2e1d262ff45a690c08e285638526ea35e785.zip
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules')
-rw-r--r--remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include3
1 files changed, 2 insertions, 1 deletions
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