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

allow templates using .xz compression

Browse Source
This commit is contained in:
Dietmar Maurer
2015-07-01 10:06:24 +02:00
parent d6d924d0bf
commit 13d2cb7980
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PVE/Storage.pm
View File

@ -683,9 +683,9 @@ sub template_list {
$info = { volid => "$sid:iso/$1", format => 'iso' }; $info = { volid => "$sid:iso/$1", format => 'iso' };
} elsif ($tt eq 'vztmpl') { } elsif ($tt eq 'vztmpl') {
next if $fn !~ m!/([^/]+\.tar\.gz)$!; next if $fn !~ m!/([^/]+\.tar\.([gx]z))$!;
$info = { volid => "$sid:vztmpl/$1", format => 'tgz' }; $info = { volid => "$sid:vztmpl/$1", format => "t$2" };
} elsif ($tt eq 'backup') { } elsif ($tt eq 'backup') {
next if $fn !~ m!/([^/]+\.(tar|tar\.gz|tar\.lzo|tgz|vma|vma\.gz|vma\.lzo))$!; next if $fn !~ m!/([^/]+\.(tar|tar\.gz|tar\.lzo|tgz|vma|vma\.gz|vma\.lzo))$!;

2
PVE/Storage/Plugin.pm
View File

@ -364,7 +364,7 @@ sub parse_volname {
return ('images', $name, $vmid, undef, undef, $isBase); return ('images', $name, $vmid, undef, undef, $isBase);
} elsif ($volname =~ m!^iso/([^/]+\.[Ii][Ss][Oo])$!) { } elsif ($volname =~ m!^iso/([^/]+\.[Ii][Ss][Oo])$!) {
return ('iso', $1); return ('iso', $1);
} elsif ($volname =~ m!^vztmpl/([^/]+\.tar\.gz)$!) { } elsif ($volname =~ m!^vztmpl/([^/]+\.tar\.[gx]z)$!) {
return ('vztmpl', $1); return ('vztmpl', $1);
} elsif ($volname =~ m!^rootdir/(\d+)$!) { } elsif ($volname =~ m!^rootdir/(\d+)$!) {
return ('rootdir', $1, $1); return ('rootdir', $1, $1);