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

fix bug 124: correctly return maxfiles flag

Browse Source
This commit is contained in:
Dietmar Maurer 2012-03-23 12:35:10 +01:00
parent cd265ba209
commit 19d5c0f227
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PVE/VZDump.pm
View File

@ -92,6 +92,7 @@ sub storage_info {
return { return {
dumpdir => PVE::Storage::get_backup_dir($cfg, $storage), dumpdir => PVE::Storage::get_backup_dir($cfg, $storage),
maxfiles => $scfg->{maxfiles},
}; };
} }
@ -486,15 +487,10 @@ sub new {
my $pd = $p->new ($self); my $pd = $p->new ($self);
push @{$self->{plugins}}, $pd; push @{$self->{plugins}}, $pd;
if (!$opts->{dumpdir} && !$opts->{storage} &&
($p eq 'PVE::VZDump::OpenVZ')) {
$opts->{dumpdir} = $pd->{dumpdir};
}
} }
if (!$opts->{dumpdir} && !$opts->{storage}) { if (!$opts->{dumpdir} && !$opts->{storage}) {
die "no dumpdir/storage specified - use option '--dumpdir' or option '--storage'\n"; $opts->{storage} = 'local';
} }
if ($opts->{storage}) { if ($opts->{storage}) {

9
debian/changelog.Debian vendored
View File

@ -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 <support@proxmox.com> Fri, 23 Mar 2012 12:36:15 +0100
pve-manager (2.0-44) unstable; urgency=low pve-manager (2.0-44) unstable; urgency=low
* Disable automatic file removal on 'Backup now' * Disable automatic file removal on 'Backup now'

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=44 PACKAGERELEASE=45
BINDIR=${DESTDIR}/usr/bin BINDIR=${DESTDIR}/usr/bin
PERLLIBDIR=${DESTDIR}/usr/share/perl5 PERLLIBDIR=${DESTDIR}/usr/share/perl5