From 61a4a721c96103fbdc448f52fb0f9c2ccb33e665 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Tue, 26 Jan 2016 02:59:06 -0500
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
---
interface/lib/plugins/vm_openvz_plugin.inc.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/interface/lib/plugins/vm_openvz_plugin.inc.php b/interface/lib/plugins/vm_openvz_plugin.inc.php
index 3249793..281fae4 100644
--- a/interface/lib/plugins/vm_openvz_plugin.inc.php
+++ b/interface/lib/plugins/vm_openvz_plugin.inc.php
@@ -178,11 +178,11 @@
$tpl->setVar('bootorder', $vm['bootorder']);
$tpl->setVar('kmemsize', $vm_template['kmemsize']);
$tpl->setVar('lockedpages', $vm_template['lockedpages']);
- $tpl->setVar('privvmpages', $burst_ram.':'.$burst_ram);
+ $tpl->setVar('privvmpages', $burst_ram.':'.$burst_ram*1.0625);
$tpl->setVar('shmpages', $guar_ram.':'.$guar_ram);
$tpl->setVar('numproc', $vm_template['numproc']);
$tpl->setVar('physpages', $vm_template['physpages']);
- $tpl->setVar('vmguarpages', $guar_ram.':'.$guar_ram);
+ $tpl->setVar('vmguarpages', $guar_ram.':unlimited');
$tpl->setVar('oomguarpages', $guar_ram.':'.$guar_ram);
$tpl->setVar('numtcpsock', $vm_template['numtcpsock']);
$tpl->setVar('numflock', $vm_template['numflock']);
--
Gitblit v1.9.1