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 7FA8A739F9 for ; Fri, 16 Apr 2021 12:35:26 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 681DE23913 for ; Fri, 16 Apr 2021 12:34:56 +0200 (CEST) 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 2BDDA2390A for ; Fri, 16 Apr 2021 12:34:54 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E40DC4206D for ; Fri, 16 Apr 2021 12:34:53 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 16 Apr 2021 12:34:50 +0200 Message-Id: <20210416103450.31974-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 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] diskmanage: improve setting usage for whole disk with include-partitions 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: Fri, 16 Apr 2021 10:35:26 -0000 in case a disk with partitions also has an fstype set, which happens for our ZFS boot disks. Do not change the behavior without include-partitons, as we prefer(red) to be more specific than simply 'partitions' then. Reported in the enterprise support channel. Signed-off-by: Fabian Ebner --- PVE/Diskmanage.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm index 64bb813..853d333 100644 --- a/PVE/Diskmanage.pm +++ b/PVE/Diskmanage.pm @@ -713,6 +713,9 @@ sub get_disks { next if $partitions->{$part}->{used} eq 'partition'; $used //= $partitions->{$part}->{used}; } + } else { + # fstype might be set even if there are partitions, but showing that is confusing + $used = 'partitions' if scalar(keys %{$partitions}); } $used //= 'partitions' if scalar(keys %{$partitions}); # multipath, software raid, etc. -- 2.20.1