From 75124b0197a20947b67b502db19af79d4936f306 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 02 Mar 2016 05:43:11 -0500
Subject: [PATCH] Merge branch 'stable-3.1'
---
server/plugins-available/openvz_plugin.inc.php | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/server/plugins-available/openvz_plugin.inc.php b/server/plugins-available/openvz_plugin.inc.php
index a50c3de..5cc4bf6 100644
--- a/server/plugins-available/openvz_plugin.inc.php
+++ b/server/plugins-available/openvz_plugin.inc.php
@@ -85,7 +85,7 @@
return;
}
- $tmp = $app->db->queryOneRecord("SELECT template_file FROM openvz_ostemplate WHERE ostemplate_id = ".$data['new']['ostemplate_id']);
+ $tmp = $app->db->queryOneRecord("SELECT template_file FROM openvz_ostemplate WHERE ostemplate_id = ?", $data['new']['ostemplate_id']);
$ostemplate = escapeshellcmd($tmp['template_file']);
unset($tmp);
@@ -121,6 +121,11 @@
file_put_contents('/etc/vz/conf/'.$veid.'.conf', $data['new']['config']);
$app->log("Writing new configuration for $veid", LOGLEVEL_DEBUG);
+ //* new diskspace for ploop-containers requieres "vzctl set"
+ if($data['new']['diskspace'] != $data['old']['diskspace']) {
+ exec("vzctl set ".$veid." --diskspace ".$data['new']['diskspace']."G --save");
+ }
+
//* Apply config changes to the VM
if($data['new']['active'] == 'y' && $data['old']['active'] == 'y') {
exec("vzctl restart $veid");
--
Gitblit v1.9.1