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 151821FF16B for ; Tue, 29 Jul 2025 13:17:01 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 20BFDED87; Tue, 29 Jul 2025 13:16:39 +0200 (CEST) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Tue, 29 Jul 2025 13:15:25 +0200 Message-ID: <20250729111557.136012-13-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250729111557.136012-1-w.bumiller@proxmox.com> References: <20250729111557.136012-1-w.bumiller@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753787749524 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.078 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 12/26] plugin: support new vtypes in activate_storage checks 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" Signed-off-by: Wolfgang Bumiller --- src/PVE/Storage/Plugin.pm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm index 98788d1..047b2fc 100644 --- a/src/PVE/Storage/Plugin.pm +++ b/src/PVE/Storage/Plugin.pm @@ -1882,15 +1882,31 @@ sub activate_storage { # check that content dirs are pairwise inequal my $resolved_subdirs = {}; - for my $vtype (sort keys $scfg->{content}->%*) { + my %done; + my $check = sub { + my ($vtype) = @_; + + return if $done{$vtype}; + $done{$vtype} = 1; + my $subdir = $class->get_subdir($scfg, $vtype); my $abs_subdir = abs_path($subdir); - next if !defined($abs_subdir); + return if !defined($abs_subdir); die "storage '$storeid' uses directory $abs_subdir for multiple content types\n" if defined($abs_subdir) && defined($resolved_subdirs->{$abs_subdir}); $resolved_subdirs->{$abs_subdir} = 1; + }; + for my $vtype (sort keys $scfg->{content}->%*) { + if ($vtype eq 'images') { + $check->('vm-vol'); + $check->('ct-vol'); + } elsif ($vtype eq 'rootdir') { + $check->('ct-vol'); + } else { + $check->($vtype); + } } } } -- 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel