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 08D056D783 for ; Tue, 28 Sep 2021 13:40:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 94503DCC1 for ; Tue, 28 Sep 2021 13:40:06 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id F1E7ADC81 for ; Tue, 28 Sep 2021 13:40:04 +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 BA99F43A85 for ; Tue, 28 Sep 2021 13:40:04 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Tue, 28 Sep 2021 13:39:44 +0200 Message-Id: <20210928114001.164081-5-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.315 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 04/10] diskmanage: wipe blockdev: also change partition type 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:50 -0000 when called with a partition. Since get_disks uses the partition type (among other things) to detect LVM and ZFS volumes, such volumes would still be seen as in-use after wiping. Thus, also change the partition type and simply use 0x83 "Linux filesystem". Signed-off-by: Fabian Ebner --- PVE/Diskmanage.pm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm index 3fea649..5614e40 100644 --- a/PVE/Diskmanage.pm +++ b/PVE/Diskmanage.pm @@ -913,6 +913,7 @@ sub change_parttype { } # Wipes all labels and the first 200 MiB of a disk/partition (or the whole if it is smaller). +# If called with a partition, also sets the partition type to 0x83 'Linux filesystem'. # Expected to be called with a result of verify_blockdev_path(). sub wipe_blockdev { my ($devpath) = @_; @@ -945,6 +946,11 @@ sub wipe_blockdev { ['dd', 'if=/dev/zero', "of=${devpath}", 'bs=1M', 'conv=fdatasync', "count=${count}"], errmsg => "error wiping '${devpath}'", ); + + if (is_partition($devpath)) { + eval { change_parttype($devpath, '8300'); }; + warn $@ if $@; + } } 1; -- 2.30.2