This is needed for OCI container images bundled as tar files, as generated by `docker save`. OCI images do not need additional compression, since the content is usually compressed already.
Signed-off-by: Filip Schauer <[email protected]> --- Changed since v2: * Modify VZTMPL_EXT_RE_1 regex to put "tar" into capture group when matching on a .tar file. src/PVE/Storage.pm | 2 +- src/PVE/Storage/Plugin.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PVE/Storage.pm b/src/PVE/Storage.pm index 1dde2b7..0bab945 100755 --- a/src/PVE/Storage.pm +++ b/src/PVE/Storage.pm @@ -115,7 +115,7 @@ PVE::Storage::Plugin->init(); our $ISO_EXT_RE_0 = qr/\.(?:iso|img)/i; -our $VZTMPL_EXT_RE_1 = qr/\.tar\.(gz|xz|zst|bz2)/i; +our $VZTMPL_EXT_RE_1 = qr/\.(?|(tar)(?!\.)|tar\.(gz|xz|zst|bz2))/i; our $BACKUP_EXT_RE_2 = qr/\.(tgz|(?:tar|vma)(?:\.(${\PVE::Storage::Plugin::COMPRESSOR_RE}))?)/; diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm index 8acd214..767087b 100644 --- a/src/PVE/Storage/Plugin.pm +++ b/src/PVE/Storage/Plugin.pm @@ -1618,7 +1618,7 @@ my $get_subdir_files = sub { } elsif ($tt eq 'vztmpl') { next if $fn !~ m!/([^/]+$PVE::Storage::VZTMPL_EXT_RE_1)$!; - $info = { volid => "$sid:vztmpl/$1", format => "t$2" }; + $info = { volid => "$sid:vztmpl/$1", format => $2 eq 'tar' ? $2 : "t$2" }; } elsif ($tt eq 'backup') { next if $fn !~ m!/([^/]+$PVE::Storage::BACKUP_EXT_RE_2)$!; -- 2.47.3 _______________________________________________ pve-devel mailing list [email protected] https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
