Skip to content

P
pve-manager
Commit 4711b80c authored by Dietmar Maurer's avatar Dietmar Maurer
Browse files
Options

fix openvz memory setting

parent d07f49c3
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 4 deletions
PVE/API2/OpenVZ.pm
View file @ 4711b80c
...@@ -737,10 +737,16 @@ __PACKAGE__->register_method({ ...@@ -737,10 +737,16 @@ __PACKAGE__->register_method({
} }
} }
$conf->{memory} = $veconf->{physpages}->{lim} ? if (defined($conf->{swappages})) {
int(($veconf->{physpages}->{lim} * 4)/ 1024) : 512; $conf->{memory} = $veconf->{physpages}->{lim} ?
$conf->{swap} = $veconf->{swappages}->{lim} ? int(($veconf->{physpages}->{lim} * 4)/ 1024) : 512;
int(($veconf->{swappages}->{lim} * 4)/1024) : 0; $conf->{swap} = $veconf->{swappages}->{lim} ?
int(($veconf->{swappages}->{lim} * 4)/1024) : 0;
} else {
$conf->{memory} = $veconf->{vmguarpages}->{bar} ?
int(($veconf->{vmguarpages}->{bar} * 4)/ 1024) : 512;
$conf->{swap} = 0;
}
my $diskspace = $veconf->{diskspace}->{bar} || LONG_MAX; my $diskspace = $veconf->{diskspace}->{bar} || LONG_MAX;
if ($diskspace == LONG_MAX) { if ($diskspace == LONG_MAX) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023