From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id B93B91FF17C for ; Wed, 11 Jun 2025 16:50:02 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C7367C29A; Wed, 11 Jun 2025 16:49:49 +0200 (CEST) From: Filip Schauer To: pve-devel@lists.proxmox.com Date: Wed, 11 Jun 2025 16:49:02 +0200 Message-Id: <20250611144903.200940-11-f.schauer@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250611144903.200940-1-f.schauer@proxmox.com> References: <20250611144903.200940-1-f.schauer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.015 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH storage v2 10/11] allow .tar container templates X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" 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 --- 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 3962077..0d43df1 100755 --- a/src/PVE/Storage.pm +++ b/src/PVE/Storage.pm @@ -117,7 +117,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(?:\.(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 1d8a8f9..76ffdb6 100644 --- a/src/PVE/Storage/Plugin.pm +++ b/src/PVE/Storage/Plugin.pm @@ -1429,7 +1429,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 ? "t$2" : "tar" }; } elsif ($tt eq 'backup') { next if $fn !~ m!/([^/]+$PVE::Storage::BACKUP_EXT_RE_2)$!; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel