From 64604dedaf7ff5c86db5e5e7d82de62ba3a1df2c Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 11 Nov 2015 09:07:53 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/lib/plugins/vm_openvz_plugin.inc.php | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/interface/lib/plugins/vm_openvz_plugin.inc.php b/interface/lib/plugins/vm_openvz_plugin.inc.php
index aae645c..3249793 100644
--- a/interface/lib/plugins/vm_openvz_plugin.inc.php
+++ b/interface/lib/plugins/vm_openvz_plugin.inc.php
@@ -134,8 +134,6 @@
foreach ($tmp_rec as $tmp) {
$app->db->datalogUpdate('openvz_ip', array('vm_id' => 0), 'ip_address_id', $tmp['ip_address_id']);
}
- unset($tmp);
- unset($tmp_rec);
}
private function applyTemplate() {
@@ -177,6 +175,7 @@
$onboot = ($vm['start_boot'] == 'y')?'yes':'no';
$tpl->setVar('onboot', $onboot);
+ $tpl->setVar('bootorder', $vm['bootorder']);
$tpl->setVar('kmemsize', $vm_template['kmemsize']);
$tpl->setVar('lockedpages', $vm_template['lockedpages']);
$tpl->setVar('privvmpages', $burst_ram.':'.$burst_ram);
--
Gitblit v1.9.1