yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

also list tar.gz and tar.lzo backup files

Browse Source
This commit is contained in:
Dietmar Maurer
2012-02-07 12:54:16 +01:00
parent 1f6610f386
commit 888709239d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PVE/Storage.pm
View File

@ -987,7 +987,7 @@ sub parse_volname_dir {
return ('vztmpl', $1); return ('vztmpl', $1);
} elsif ($volname =~ m!^rootdir/(\d+)$!) { } elsif ($volname =~ m!^rootdir/(\d+)$!) {
return ('rootdir', $1, $1); return ('rootdir', $1, $1);
} elsif ($volname =~ m!^backup/([^/]+(\.tar|\.tgz))$!) { } elsif ($volname =~ m!^backup/([^/]+(\.(tar|tar\.gz|tar\.lzo|tgz)))$!) {
my $fn = $1; my $fn = $1;
if ($fn =~ m/^vzdump-(openvz|qemu)-(\d+)-.+/) { if ($fn =~ m/^vzdump-(openvz|qemu)-(\d+)-.+/) {
return ('backup', $fn, $2); return ('backup', $fn, $2);
@ -1062,7 +1062,7 @@ sub path_to_volume_id {
} elsif ($path =~ m!^$privatedir/(\d+)$!) { } elsif ($path =~ m!^$privatedir/(\d+)$!) {
my $vmid = $1; my $vmid = $1;
return ('rootdir', "$sid:rootdir/$vmid"); return ('rootdir', "$sid:rootdir/$vmid");
} elsif ($path =~ m!^$backupdir/([^/]+\.(tar|tgz))$!) { } elsif ($path =~ m!^$backupdir/([^/]+\.(tar|tar\.gz|tar\.lzo|tgz))$!) {
my $name = $1; my $name = $1;
return ('iso', "$sid:backup/$name"); return ('iso', "$sid:backup/$name");
} }
@ -1550,7 +1550,7 @@ sub template_list {
$info = { volid => "$sid:vztmpl/$1", format => 'tgz' }; $info = { volid => "$sid:vztmpl/$1", format => 'tgz' };
} elsif ($tt eq 'backup') { } elsif ($tt eq 'backup') {
next if $fn !~ m!/([^/]+\.(tar|tgz))$!; next if $fn !~ m!/([^/]+\.(tar|tar\.gz|tar\.lzo|tgz))$!;
$info = { volid => "$sid:backup/$1", format => $2 }; $info = { volid => "$sid:backup/$1", format => $2 };
} }