From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 28D5B1FF185 for ; Mon, 17 Nov 2025 14:54:23 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0E2021A141; Mon, 17 Nov 2025 14:54:24 +0100 (CET) Date: Mon, 17 Nov 2025 14:54:18 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20251117113145.74405-1-f.schauer@proxmox.com> <22df8127-b195-492d-b313-06443d782a8a@proxmox.com> In-Reply-To: <22df8127-b195-492d-b313-06443d782a8a@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.17.0 (https://github.com/astroidmail/astroid) Message-Id: <1763387388.vfb3i29jdy.astroid@yuna.none> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1763387632308 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.047 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: Re: [pve-devel] [PATCH container] fix regression breaking container restore from PBS 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" On November 17, 2025 1:22 pm, Filip Schauer wrote: > On 17/11/2025 12:31, Filip Schauer wrote: >> This fixes a regression caused by an abs_filesystem_path call introduced >> with OCI image support. When trying to restore a container from a >> Proxmox Backup Server, this tried to resolve a path on a PBS datastore >> as a local file system path. This is fixed by only calling >> abs_filesystem_path on path-based storages. >> >> Fixes: 2aed26d320ae ("add support for OCI images as container >> templates") >> >> Signed-off-by: Filip Schauer >> --- >> src/PVE/API2/LXC.pm | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm >> index cffa17a..f74f19d 100644 >> --- a/src/PVE/API2/LXC.pm >> +++ b/src/PVE/API2/LXC.pm >> @@ -544,7 +544,7 @@ __PACKAGE__->register_method({ >> my $rootdir = PVE::LXC::mount_all($vmid, $storage_cfg, $conf, 1); >> my $archivepath = '-'; >> $archivepath = PVE::Storage::abs_filesystem_path($storage_cfg, $archive) >> - if ($archive ne '-'); >> + if ($archive ne '-' && $storage_cfg->{path}); >> $bwlimit = PVE::Storage::get_bandwidth_limit( >> 'restore', [keys %used_storages], $bwlimit, >> ); > > Unfortunatelly I only just noticed that this seems to break OCI images > for me. $storage_cfg is not the section of the storage, but the full storage.cfg .. but I think this whole section should be revamped.. we should have PVE::LXC::archive_is_oci_format($storage_cfg, $archive) and then we can just inline that and have a combined PVE::LXC::restore_oci_archive($storage_cfg, $archive, $conf) that combines the two current helpers (extract_oci_config and merge_oci_conf_into_pct_conf) which are both only called once.. and we end up with if ($restore && $archive ne '-') { print "restoring '$archive' now..\n"; } elsif (PVE::LXC::archive_is_oci_format($storage_cfg, $archive) { print "Detected OCI archive\n"; PVE::LXC::restore_oci_archive($storage_cfg, $archive, $conf); } else { # Not an OCI image, so restore it as an LXC image instead PVE::LXC::Create::restore_archive( _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel