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 0D0886D67E for ; Tue, 28 Sep 2021 13:40:09 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AE14FDD37 for ; Tue, 28 Sep 2021 13:40:08 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 A9498DCAA for ; Tue, 28 Sep 2021 13:40:05 +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 7755C44B2D for ; Tue, 28 Sep 2021 13:40:05 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Tue, 28 Sep 2021 13:39:48 +0200 Message-Id: <20210928114001.164081-9-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210928114001.164081-1-f.ebner@proxmox.com> References: <20210928114001.164081-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.311 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 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 08/10] diskmanage: allow passing partitions to get_disks 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, 28 Sep 2021 11:40:09 -0000 Requires that the $include_partitions parameter is set too, which: 1. Makes sense, because the partition won't be included in the result otherwise. 2. Ensures backwards compatibility for existing callers that don't use $include_partitions. No existing callers use both $disks and $include_partitions at the same time, so nothing learns to "support" partitions by accident. Moving the strip_dev helper to the top, so it can be used everywhere. Signed-off-by: Fabian Ebner --- PVE/Diskmanage.pm | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm index d4acc93..f0e14dc 100644 --- a/PVE/Diskmanage.pm +++ b/PVE/Diskmanage.pm @@ -20,6 +20,12 @@ my $PVS = "/sbin/pvs"; my $LVS = "/sbin/lvs"; my $LSBLK = "/bin/lsblk"; +my sub strip_dev :prototype($) { + my ($devpath) = @_; + $devpath =~ s|^/dev/||; + return $devpath; +} + sub check_bin { my ($path) = @_; return -x $path; @@ -518,6 +524,14 @@ sub get_disks { # we get cciss/c0d0 but need cciss!c0d0 $_ =~ s|cciss/|cciss!| for @$disks; + if ($include_partitions) { + # Proper blockdevice is needed for the regex, use parent for partitions. + for my $disk ($disks->@*) { + next if !is_partition("/dev/$disk"); + $disk = strip_dev(get_blockdev("/dev/$disk")); + } + } + $disk_regex = "(?:" . join('|', @$disks) . ")"; } @@ -852,12 +866,6 @@ sub append_partition { return $partition; } -my sub strip_dev :prototype($) { - my ($devpath) = @_; - $devpath =~ s|^/dev/||; - return $devpath; -} - # Check if a disk or any of its partitions has a holder. # Can also be called with a partition. # Expected to be called with a result of verify_blockdev_path(). -- 2.30.2