avoid warning in pvestatd for containers with old config files

diff --git a/PVE/OpenVZ.pm b/PVE/OpenVZ.pm
index d0643f9899b777d2bddbda380c0d99582490dbce..04f2864896c141be21b767107308b02c5fedbe4e 100644 (file)
--- a/PVE/OpenVZ.pm
+++ b/PVE/OpenVZ.pm
@@ -209,10 +209,18 @@ sub vmstatus {
            $d->{disk} = 0;
            $d->{maxdisk} = int($conf->{diskspace}->{bar} * 1024);
 
-           $d->{mem} = 0;
-           $d->{maxmem} = int((($conf->{physpages}->{lim} + $conf->{swappages}->{lim})* 4096));
-           $d->{swap} = 0;
-           $d->{maxswap} = int((($conf->{swappages}->{lim})* 4096));
+           if (defined($conf->{swappages})) {
+               $d->{mem} = 0;
+               $d->{maxmem} = int((($conf->{physpages}->{lim} + 
+                                    $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->{failcnt} = 0;

diff --git a/debian/changelog.Debian b/debian/changelog.Debian
index c00add3e7fd5d3196b6905ed1e209a67d6e643a4..f2faa7dcfa06cc5d250b256349de876e55665f98 100644 (file)
--- a/debian/changelog.Debian
+++ b/debian/changelog.Debian
@@ -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
 
   * add Swedish keyboard layout

diff --git a/defines.mk b/defines.mk
index e9dd418cd94bd4f177f4a5841f4cbf7606c48fde..e3be77e5b73a200922eb060c116cda4ddc0c20a9 100644 (file)
--- a/defines.mk
+++ b/defines.mk
@@ -2,7 +2,7 @@ RELEASE=2.0
 
 VERSION=2.0
 PACKAGE=pve-manager
-PACKAGERELEASE=34
+PACKAGERELEASE=35
 
 BINDIR=${DESTDIR}/usr/bin
 PERLLIBDIR=${DESTDIR}/usr/share/perl5