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 7AC3F720C7 for ; Wed, 6 Oct 2021 11:19:30 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5F66E9DA4 for ; Wed, 6 Oct 2021 11:19:00 +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 2DA749D30 for ; Wed, 6 Oct 2021 11:18:58 +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 AC76145802 for ; Wed, 6 Oct 2021 11:18:57 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Wed, 6 Oct 2021 11:18:41 +0200 Message-Id: <20211006091853.82237-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211006091853.82237-1-f.ebner@proxmox.com> References: <20211006091853.82237-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.289 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 v2 storage 1/6] diskmanage: add change_parttype and is_partition helpers 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: Wed, 06 Oct 2021 09:19:30 -0000 For change_parttype, only GPT-partitioned disks are supported, as I didn't see an option for sgdisk to make it also work with MBR-partitioned disks. And while sfdisk could be used instead (or additionally) it would be a new dependency, and AFAICS require some conversion of partition type GUIDs to MBR types on our part. Signed-off-by: Fabian Ebner --- Changes from v1: * Add is_partition helper here, because it is used in the next patch. PVE/Diskmanage.pm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm index 36f452c..9d5b037 100644 --- a/PVE/Diskmanage.pm +++ b/PVE/Diskmanage.pm @@ -813,6 +813,12 @@ sub get_blockdev { return $block_dev; } +sub is_partition { + my ($dev_path) = @_; + + return defined(eval { get_partnum($dev_path) }); +} + sub locked_disk_action { my ($sub) = @_; my $res = PVE::Tools::lock_file('/run/lock/pve-diskmanage.lck', undef, $sub); @@ -903,6 +909,23 @@ sub is_mounted { return $found; } +# Currently only supports GPT-partitioned disks. +sub change_parttype { + my ($partpath, $parttype) = @_; + + my $err = "unable to change partition type for $partpath"; + + my $partnum = get_partnum($partpath); + my $blockdev = get_blockdev($partpath); + my $dev = strip_dev($blockdev); + + my $info = get_disks($dev, 1); + die "$err - unable to get disk info for '$blockdev'\n" if !defined($info->{$dev}); + die "$err - disk '$blockdev' is not GPT partitioned\n" if !$info->{$dev}->{gpt}; + + run_command(['sgdisk', "-t${partnum}:${parttype}", $blockdev], errmsg => $err); +} + # Wipes all labels and the first 200 MiB of a disk/partition (or the whole if it is smaller). # Expected to be called with a result of verify_blockdev_path(). sub wipe_blockdev { -- 2.30.2