From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id F0DCB6B495 for ; Tue, 26 Jan 2021 12:46:09 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B2D7A15A16 for ; Tue, 26 Jan 2021 12:45:38 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id DE64D1596B for ; Tue, 26 Jan 2021 12:45:35 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id AAB5146120 for ; Tue, 26 Jan 2021 12:45:35 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Tue, 26 Jan 2021 12:45:22 +0100 Message-Id: <20210126114530.8753-7-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210126114530.8753-1-f.ebner@proxmox.com> References: <20210126114530.8753-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.007 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [diskmanage.pm] Subject: [pve-devel] [PATCH storage 06/14] Diskmanage: collect partitions in hash 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: , X-List-Received-Date: Tue, 26 Jan 2021 11:46:10 -0000 Signed-off-by: Fabian Ebner --- PVE/Diskmanage.pm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm index 6d96e77..a06f8ae 100644 --- a/PVE/Diskmanage.pm +++ b/PVE/Diskmanage.pm @@ -615,7 +615,6 @@ sub get_disks { my $db_count = 0; my $wal_count = 0; - my $found_partitions; my $found_lvm; my $found_mountpoints; my $found_zfs; @@ -627,10 +626,15 @@ sub get_disks { # e.g. from /dev/cciss/c0d0 get /dev/cciss $partpath =~ s/\/[^\/]+$//; + my $partitions = {}; + dir_glob_foreach("$sysdir", "$dev.+", sub { my ($part) = @_; - $found_partitions = 1; + $partitions->{$part}->{devpath} = "$partpath/$part"; + $partitions->{$part}->{gpt} = $data->{gpt}; + $partitions->{$part}->{size} = + get_sysdir_size("$sysdir/$part") // 0; if (my $mp = $mounted->{"$partpath/$part"}) { $found_mountpoints = 1; @@ -674,7 +678,7 @@ sub get_disks { $used = 'LVM' if $found_lvm && !$used; $used = 'ZFS' if $found_zfs && !$used; $used = 'Device Mapper' if $found_dm && !$used; - $used = 'partitions' if $found_partitions && !$used; + $used = 'partitions' if scalar(keys %{$partitions}) && !$used; # multipath, software raid, etc. # this check comes in last, to show more specific info -- 2.20.1