[pve-devel] r6525 - in pve-manager/trunk: . debian lib/PVE

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-08-31 14:35:52 +0200 (Wed, 31 Aug 2011)
New Revision: 6525

Modified:
   pve-manager/trunk/ChangeLog
   pve-manager/trunk/configure.in
   pve-manager/trunk/debian/changelog.Debian
   pve-manager/trunk/lib/PVE/Config.pm
Log:
support newer vzctl versions


Modified: pve-manager/trunk/ChangeLog
===================================================================
--- pve-manager/trunk/ChangeLog	2011-08-31 10:53:49 UTC (rev 6524)
+++ pve-manager/trunk/ChangeLog	2011-08-31 12:35:52 UTC (rev 6525)
@@ -1,3 +1,8 @@
+2011-08-31  Proxmox Support Team  <support at proxmox.com>
+
+	* lib/PVE/Config.pm (read_vzconfig): make parser working with
+	newer versions of vzctl.
+
 2011-07-29  Proxmox Support Team  <support at proxmox.com>
 
 	* www/root/backup/index.htm: add maxfiles option (include patch

Modified: pve-manager/trunk/configure.in
===================================================================
--- pve-manager/trunk/configure.in	2011-08-31 10:53:49 UTC (rev 6524)
+++ pve-manager/trunk/configure.in	2011-08-31 12:35:52 UTC (rev 6525)
@@ -4,7 +4,7 @@
 
 prefix=/usr
 
-PACKAGERELEASE=19
+PACKAGERELEASE=20
 AC_SUBST(PACKAGERELEASE)
 
 REPOID=`svnversion .`

Modified: pve-manager/trunk/debian/changelog.Debian
===================================================================
--- pve-manager/trunk/debian/changelog.Debian	2011-08-31 10:53:49 UTC (rev 6524)
+++ pve-manager/trunk/debian/changelog.Debian	2011-08-31 12:35:52 UTC (rev 6525)
@@ -1,3 +1,9 @@
+pve-manager (1.8-20) unstable; urgency=low
+
+  * support newer vzctl versions.
+
+ -- Proxmox Support Team <support at proxmox.com>  Wed, 31 Aug 2011 14:35:01 +0200
+
 pve-manager (1.8-19) unstable; urgency=low
 
   * support 'maxfiles' backup option.

Modified: pve-manager/trunk/lib/PVE/Config.pm
===================================================================
--- pve-manager/trunk/lib/PVE/Config.pm	2011-08-31 10:53:49 UTC (rev 6524)
+++ pve-manager/trunk/lib/PVE/Config.pm	2011-08-31 12:35:52 UTC (rev 6525)
@@ -271,9 +271,13 @@
 	    my $name = lc ($1);
 	    my $text = $2;
 
-	    if ($text =~ m/^(\d+):(\d+)$/) {
+	    if ($name eq 'lockedpages') {
+		if ($text =~ m/^(\d+)(:.*)?$/) {
+		    $data->{$name}->{bar} = $data->{$name}->{lim} = $1;
+		}
+	    } elsif ($text =~ m/^(\d+):(\d+|unlimited)$/) {
 		my $bar = $1;
-		my $lim = $2;
+		my $lim = $2 eq 'unlimited' ? 9223372036854775807 : $2;
 		
 		$data->{$name}->{bar} = $bar;
 		$data->{$name}->{lim} = $lim;