diff options
| author | Sebastian Schmelzer | 2011-05-02 17:02:18 +0200 |
|---|---|---|
| committer | Sebastian Schmelzer | 2011-05-02 17:02:18 +0200 |
| commit | e006081ce776425f649538af2f985cc6cbd673e1 (patch) | |
| tree | 44e9c3195b2aeae28a034877076b5b80bb9e7152 /src | |
| parent | update pxelinux stuff to 4.0.4-pre22 (pxechain working again) (diff) | |
| download | core-e006081ce776425f649538af2f985cc6cbd673e1.tar.gz core-e006081ce776425f649538af2f985cc6cbd673e1.tar.xz core-e006081ce776425f649538af2f985cc6cbd673e1.zip | |
apply dirks patch to stable tree ..
Diffstat (limited to 'src')
| -rw-r--r-- | src/os-plugins/plugins/vmchooser/files/run-virt.sh | 2 | ||||
| -rw-r--r-- | src/os-plugins/plugins/vmchooser/files/vmchooser | bin | 1544542 -> 1530562 bytes | |||
| -rw-r--r-- | src/os-plugins/plugins/vmware/XX_vmware.sh | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/os-plugins/plugins/vmchooser/files/run-virt.sh b/src/os-plugins/plugins/vmchooser/files/run-virt.sh index 0be23ec1..8d79b041 100644 --- a/src/os-plugins/plugins/vmchooser/files/run-virt.sh +++ b/src/os-plugins/plugins/vmchooser/files/run-virt.sh @@ -283,7 +283,7 @@ VM_ID="00" cpu_cores=${cpu_cores:-"1"} # total amount of memory defined in stage 3 -permem=70 +permem=60 # get a result which can be divided through 4 mem=$(expr ${totalmem} / 100 \* ${permem} / 4 \* 4) if [ -n "${mainvirtmem}" ]; then diff --git a/src/os-plugins/plugins/vmchooser/files/vmchooser b/src/os-plugins/plugins/vmchooser/files/vmchooser Binary files differindex d814aad9..745cdb71 100644 --- a/src/os-plugins/plugins/vmchooser/files/vmchooser +++ b/src/os-plugins/plugins/vmchooser/files/vmchooser diff --git a/src/os-plugins/plugins/vmware/XX_vmware.sh b/src/os-plugins/plugins/vmware/XX_vmware.sh index 4ed01e51..3b5f6172 100644 --- a/src/os-plugins/plugins/vmware/XX_vmware.sh +++ b/src/os-plugins/plugins/vmware/XX_vmware.sh @@ -160,7 +160,7 @@ prefvmx.useRecommendedLockedMemSize = "TRUE"' | sed -e "s/^ *//" \ >/mnt/etc/vmware/config else # disable VMware swapping else - echo -e '.encoding = "UTF-8"\nprefvmx.minVmMemPct = "100" + echo -e '.encoding = "UTF-8"\nprefvmx.minVmMemPct = "80" prefvmx.useRecommendedLockedMemSize = "TRUE"' | sed -e "s/^ *//" \ >/mnt/etc/vmware/config fi |