diff options
| author | Jonathan Bauer | 2013-07-30 17:17:05 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2013-07-30 17:17:05 +0200 |
| commit | 04ce2e1d262ff45a690c08e285638526ea35e785 (patch) | |
| tree | cd23d8eda0c4ebd5fa5b871337da889a9c374fc0 /remote | |
| parent | [rootfs-stage32] mount tmp partition after sysinit target, not before (diff) | |
| parent | [vmplayer] fix memory limit on old vmware hardware versions (diff) | |
| download | tm-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')
| -rw-r--r-- | remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include | 3 | ||||
| -rwxr-xr-x | remote/rootfs/rootfs-stage32/data/opt/openslx/bin/analyse-disk | 8 |
2 files changed, 9 insertions, 2 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 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 |