diff options
| author | Michael Janczyk | 2010-06-08 17:13:58 +0200 |
|---|---|---|
| committer | Michael Janczyk | 2010-06-08 17:13:58 +0200 |
| commit | 8f7c43ff2a2c5ba981ffc714f65c0e42d8132f04 (patch) | |
| tree | ff9235c492ad50d45393bb8c19bb64221da100aa /os-plugins/plugins/vmware/files | |
| parent | Merge branch 'master' into vmgrid (diff) | |
| parent | vmversion is 6 or 7 when workstation is installed as well (diff) | |
| download | core-8f7c43ff2a2c5ba981ffc714f65c0e42d8132f04.tar.gz core-8f7c43ff2a2c5ba981ffc714f65c0e42d8132f04.tar.xz core-8f7c43ff2a2c5ba981ffc714f65c0e42d8132f04.zip | |
Merge branch 'master' into vmgrid
Diffstat (limited to 'os-plugins/plugins/vmware/files')
| -rw-r--r-- | os-plugins/plugins/vmware/files/run-virt.include | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/os-plugins/plugins/vmware/files/run-virt.include b/os-plugins/plugins/vmware/files/run-virt.include index 2c501156..714fee36 100644 --- a/os-plugins/plugins/vmware/files/run-virt.include +++ b/os-plugins/plugins/vmware/files/run-virt.include @@ -305,10 +305,10 @@ if [ -n "${forcemem}" ]; then mem="${forcemem}" else case "$vmversion" in - 2.*) + 2.*|6.*) permem=30 ;; - 3.*) + 3.*|7.*) permem=25 ;; esac |