proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-07-26 04:31:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avoid warning in pvestatd for containers with old config files

Browse Source
This commit is contained in:
Dietmar Maurer 2012-02-27 11:38:08 +01:00
parent f8b5f601b0
commit 56b47e66e8
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
PVE/OpenVZ.pm
View File

@ -209,10 +209,18 @@ sub vmstatus {
$d->{disk} = 0; $d->{disk} = 0;
$d->{maxdisk} = int($conf->{diskspace}->{bar} * 1024); $d->{maxdisk} = int($conf->{diskspace}->{bar} * 1024);
$d->{mem} = 0; if (defined($conf->{swappages})) {
$d->{maxmem} = int((($conf->{physpages}->{lim} + $conf->{swappages}->{lim})* 4096)); $d->{mem} = 0;
$d->{swap} = 0; $d->{maxmem} = int((($conf->{physpages}->{lim} +
$d->{maxswap} = int((($conf->{swappages}->{lim})* 4096)); $conf->{swappages}->{lim})* 4096));
$d->{swap} = 0;
$d->{maxswap} = int((($conf->{swappages}->{lim})* 4096));
} else {
$d->{mem} = 0;
$d->{maxmem} = int($conf->{vmguarpages}->{bar} * 4096);
$d->{swap} = 0;
$d->{maxswap} = 0;
}
$d->{nproc} = 0; $d->{nproc} = 0;
$d->{failcnt} = 0; $d->{failcnt} = 0;

6
debian/changelog.Debian vendored
View File

@ -1,3 +1,9 @@
pve-manager (2.0-35) unstable; urgency=low
* avoid warning in pvestatd for containers with old config files
-- Proxmox Support Team <support@proxmox.com> Mon, 27 Feb 2012 11:37:48 +0100
pve-manager (2.0-34) unstable; urgency=low pve-manager (2.0-34) unstable; urgency=low
* add Swedish keyboard layout * add Swedish keyboard layout

2
defines.mk
View File

@ -2,7 +2,7 @@ RELEASE=2.0
VERSION=2.0 VERSION=2.0
PACKAGE=pve-manager PACKAGE=pve-manager
PACKAGERELEASE=34 PACKAGERELEASE=35
BINDIR=${DESTDIR}/usr/bin BINDIR=${DESTDIR}/usr/bin
PERLLIBDIR=${DESTDIR}/usr/share/perl5 PERLLIBDIR=${DESTDIR}/usr/share/perl5