[pve-devel] r6379 - in pve-manager/trunk: . debian lib/PVE www/root/backup

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-07-29 06:48:44 +0200 (Fri, 29 Jul 2011)
New Revision: 6379

Modified:
   pve-manager/trunk/ChangeLog
   pve-manager/trunk/configure.in
   pve-manager/trunk/debian/changelog.Debian
   pve-manager/trunk/lib/PVE/Config.pm
   pve-manager/trunk/www/root/backup/index.htm
Log:
include patch fro Michel (maxfiles option)


Modified: pve-manager/trunk/ChangeLog
===================================================================
--- pve-manager/trunk/ChangeLog	2011-07-28 10:22:42 UTC (rev 6378)
+++ pve-manager/trunk/ChangeLog	2011-07-29 04:48:44 UTC (rev 6379)
@@ -1,3 +1,8 @@
+2011-07-29  Proxmox Support Team  <support at proxmox.com>
+
+	* www/root/backup/index.htm: add maxfiles option (include patch
+	from Michel)
+
 2011-06-01  Proxmox Support Team  <support at proxmox.com>
 
 	* po/ja.po: update

Modified: pve-manager/trunk/configure.in
===================================================================
--- pve-manager/trunk/configure.in	2011-07-28 10:22:42 UTC (rev 6378)
+++ pve-manager/trunk/configure.in	2011-07-29 04:48:44 UTC (rev 6379)
@@ -4,7 +4,7 @@
 
 prefix=/usr
 
-PACKAGERELEASE=18
+PACKAGERELEASE=19
 AC_SUBST(PACKAGERELEASE)
 
 REPOID=`svnversion .`

Modified: pve-manager/trunk/debian/changelog.Debian
===================================================================
--- pve-manager/trunk/debian/changelog.Debian	2011-07-28 10:22:42 UTC (rev 6378)
+++ pve-manager/trunk/debian/changelog.Debian	2011-07-29 04:48:44 UTC (rev 6379)
@@ -1,3 +1,9 @@
+pve-manager (1.8-19) unstable; urgency=low
+
+  * support 'maxfiles' backup option.
+
+ -- Proxmox Support Team <support at proxmox.com>  Fri, 29 Jul 2011 06:47:17 +0200
+
 pve-manager (1.8-18) unstable; urgency=low
 
   * updated japanese translations

Modified: pve-manager/trunk/lib/PVE/Config.pm
===================================================================
--- pve-manager/trunk/lib/PVE/Config.pm	2011-07-28 10:22:42 UTC (rev 6378)
+++ pve-manager/trunk/lib/PVE/Config.pm	2011-07-29 04:48:44 UTC (rev 6379)
@@ -811,6 +811,7 @@
 		my $opt_snap;
 		my $opt_node;
 		my $opt_quiet;
+		my $opt_maxfiles;
 
 		local @ARGV = split /\s+/, $param;
 		if (!GetOptions ('all' => \$opt_all,
@@ -822,6 +823,7 @@
 				 'quiet' =>\$opt_quiet,
 				 'node=i' =>\$opt_node,
 				 'storage=s' =>\$opt_storage,
+				 'maxfiles=i' => \$opt_maxfiles,
 				 'dumpdir=s' => \$opt_dumpdir)) {
 
 		    die "unable to parse vzdump options in '$filename'\n";
@@ -840,6 +842,7 @@
 		    $d->{includeall} = $opt_all;
 		    $d->{mailto} = $opt_mailto ? join (' ', @$opt_mailto) : '';
 		    $d->{node} = $opt_node || 0;
+		    $d->{maxfiles} = $opt_maxfiles || 1;
 
 		    my $vmlist = '';
 		    foreach my $vmid (@ARGV) {
@@ -921,6 +924,7 @@
 	$param .= " --compress" if $d->{compress};
 	$param .= " --dumpdir $d->{dumpdir}" if $d->{dumpdir};
 	$param .= " --storage $d->{storage}" if $d->{storage};
+	$param .= " --maxfiles $d->{maxfiles}" if $d->{maxfiles};
 
 	if (my $mailto = $d->{mailto}) {
 	    $mailto =~ s/[,;]/ /g;

Modified: pve-manager/trunk/www/root/backup/index.htm
===================================================================
--- pve-manager/trunk/www/root/backup/index.htm	2011-07-28 10:22:42 UTC (rev 6378)
+++ pve-manager/trunk/www/root/backup/index.htm	2011-07-29 04:48:44 UTC (rev 6379)
@@ -86,6 +86,8 @@
 
      $d->{mailto} = $fdat{mailto};
 
+     $d->{maxfiles} = $fdat{maxfiles};
+
      my $found = 0;
      foreach my $day (split ('\s+', $fdat{dow})) {
        $d->{$day} = 1;
@@ -129,6 +131,7 @@
 	    node => $cinfo->{local}->{cid},
 	    includeall => 0,
 	    mailto => '',
+	    maxfiles => '1',
 	  };
 
      $d->{storage} = $def_storage;
@@ -159,6 +162,9 @@
    if (!defined ($fdat{mailto})) {
      $fdat{mailto} = $d->{mailto};
    }
+   if (!defined ($fdat{maxfiles})) {
+     $fdat{maxfiles} = $d->{maxfiles};
+   }
    if (!defined ($fdat{bkmode})) {
      $fdat{bkmode} = $d->{mode};
      $fdat{dow} = $d->{dow};
@@ -201,7 +207,9 @@
    }
 
    $grid->add_row (__("Day of Week") . ':',
-		   $form->create_element ('dow', 'dow', $fdat{dow}));
+		   $form->create_element ('dow', 'dow', $fdat{dow}),
+                   __("Max files") . ':',
+                   $form->create_element ('maxfiles', 'text', $fdat{maxfiles}));
 
 
    $grid->add_row (__("Start time") . ':',