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 BE67E720BE for ; Wed, 6 Oct 2021 11:19:29 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7AFB09DFE for ; Wed, 6 Oct 2021 11:19:02 +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 DF9FA9D80 for ; Wed, 6 Oct 2021 11:18:59 +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 B3B80457EA for ; Wed, 6 Oct 2021 11:18:59 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Wed, 6 Oct 2021 11:18:46 +0200 Message-Id: <20211006091853.82237-7-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.285 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. [zfs.pm, directory.pm, lvmthin.pm, lvm.pm] Subject: [pve-devel] [PATCH v2 storage 6/6] api: disks: create: set correct 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: Wed, 06 Oct 2021 09:19:29 -0000 Signed-off-by: Fabian Ebner --- No changes from v1. PVE/API2/Disks/Directory.pm | 5 ++++- PVE/API2/Disks/LVM.pm | 5 +++++ PVE/API2/Disks/LVMThin.pm | 5 +++++ PVE/API2/Disks/ZFS.pm | 11 +++++++++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/PVE/API2/Disks/Directory.pm b/PVE/API2/Disks/Directory.pm index 52f0c86..3a90a2e 100644 --- a/PVE/API2/Disks/Directory.pm +++ b/PVE/API2/Disks/Directory.pm @@ -216,7 +216,10 @@ __PACKAGE__->register_method ({ my $part = $dev; - if (!PVE::Diskmanage::is_partition($dev)) { + if (PVE::Diskmanage::is_partition($dev)) { + eval { PVE::Diskmanage::change_parttype($dev, '8300'); }; + warn $@ if $@; + } else { # create partition my $cmd = [$SGDISK, '-n1', '-t1:8300', $dev]; print "# ", join(' ', @$cmd), "\n"; diff --git a/PVE/API2/Disks/LVM.pm b/PVE/API2/Disks/LVM.pm index eb8f5c0..885e02b 100644 --- a/PVE/API2/Disks/LVM.pm +++ b/PVE/API2/Disks/LVM.pm @@ -156,6 +156,11 @@ __PACKAGE__->register_method ({ PVE::Diskmanage::locked_disk_action(sub { PVE::Diskmanage::assert_disk_unused($dev); + if (PVE::Diskmanage::is_partition($dev)) { + eval { PVE::Diskmanage::change_parttype($dev, '8E00'); }; + warn $@ if $@; + } + PVE::Storage::LVMPlugin::lvm_create_volume_group($dev, $name); # FIXME: Remove once we depend on systemd >= v249. diff --git a/PVE/API2/Disks/LVMThin.pm b/PVE/API2/Disks/LVMThin.pm index 2fd8484..83ebc46 100644 --- a/PVE/API2/Disks/LVMThin.pm +++ b/PVE/API2/Disks/LVMThin.pm @@ -110,6 +110,11 @@ __PACKAGE__->register_method ({ PVE::Diskmanage::locked_disk_action(sub { PVE::Diskmanage::assert_disk_unused($dev); + if (PVE::Diskmanage::is_partition($dev)) { + eval { PVE::Diskmanage::change_parttype($dev, '8E00'); }; + warn $@ if $@; + } + PVE::Storage::LVMPlugin::lvm_create_volume_group($dev, $name); my $pv = PVE::Storage::LVMPlugin::lvm_pv_info($dev); # keep some free space just in case diff --git a/PVE/API2/Disks/ZFS.pm b/PVE/API2/Disks/ZFS.pm index 6486404..7f96bb7 100644 --- a/PVE/API2/Disks/ZFS.pm +++ b/PVE/API2/Disks/ZFS.pm @@ -375,6 +375,17 @@ __PACKAGE__->register_method ({ PVE::Diskmanage::assert_disk_unused($dev); my $is_partition = PVE::Diskmanage::is_partition($dev); + + if ($is_partition) { + eval { + PVE::Diskmanage::change_parttype( + $dev, + '6a898cc3-1dd2-11b2-99a6-080020736631', + ); + }; + warn $@ if $@; + } + my $sysfsdev = $is_partition ? PVE::Diskmanage::get_blockdev($dev) : $dev; $sysfsdev =~ s!^/dev/!/sys/block/!; -- 2.30.2