diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index 835e878b..893a0d2b 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -92,6 +92,7 @@ sub storage_info { return { dumpdir => PVE::Storage::get_backup_dir($cfg, $storage), + maxfiles => $scfg->{maxfiles}, }; } @@ -486,15 +487,10 @@ sub new { my $pd = $p->new ($self); push @{$self->{plugins}}, $pd; - - if (!$opts->{dumpdir} && !$opts->{storage} && - ($p eq 'PVE::VZDump::OpenVZ')) { - $opts->{dumpdir} = $pd->{dumpdir}; - } } if (!$opts->{dumpdir} && !$opts->{storage}) { - die "no dumpdir/storage specified - use option '--dumpdir' or option '--storage'\n"; + $opts->{storage} = 'local'; } if ($opts->{storage}) { diff --git a/debian/changelog.Debian b/debian/changelog.Debian index d132835f..f1d73fc4 100644 --- a/debian/changelog.Debian +++ b/debian/changelog.Debian @@ -1,3 +1,12 @@ +pve-manager (2.0-45) unstable; urgency=low + + * fix bug 124: correctly return maxfiles flag + + * vzdump: use storage 'local' as default backup target (instead of using + Openvz dump directory settings) + + -- Proxmox Support Team Fri, 23 Mar 2012 12:36:15 +0100 + pve-manager (2.0-44) unstable; urgency=low * Disable automatic file removal on 'Backup now' diff --git a/defines.mk b/defines.mk index a0bb686b..f2d76aef 100644 --- a/defines.mk +++ b/defines.mk @@ -2,7 +2,7 @@ RELEASE=2.0 VERSION=2.0 PACKAGE=pve-manager -PACKAGERELEASE=44 +PACKAGERELEASE=45 BINDIR=${DESTDIR}/usr/bin PERLLIBDIR=${DESTDIR}/usr/share/perl5