From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH storage 06/10] api: disks: initgpt: explicitly abort for partitions
Date: Tue, 28 Sep 2021 13:39:46 +0200 [thread overview]
Message-ID: <20210928114001.164081-7-f.ebner@proxmox.com> (raw)
In-Reply-To: <20210928114001.164081-1-f.ebner@proxmox.com>
In preparation to extend disk_is_used to support partitions. Without
this new check, initgpt would also allow partitions once disk_is_used
supports partitions, which is not desirable.
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
PVE/API2/Disks.pm | 1 +
PVE/Diskmanage.pm | 10 ++++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/PVE/API2/Disks.pm b/PVE/API2/Disks.pm
index 96c19fd..25c9ded 100644
--- a/PVE/API2/Disks.pm
+++ b/PVE/API2/Disks.pm
@@ -260,6 +260,7 @@ __PACKAGE__->register_method ({
my $authuser = $rpcenv->get_user();
+ die "$disk is a partition\n" if PVE::Diskmanage::is_partition($disk);
die "disk $disk already in use\n" if PVE::Diskmanage::disk_is_used($disk);
my $worker = sub {
PVE::Diskmanage::init_disk($disk, $param->{uuid});
diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm
index 7aad707..73cbb8b 100644
--- a/PVE/Diskmanage.pm
+++ b/PVE/Diskmanage.pm
@@ -57,8 +57,8 @@ sub init_disk {
assert_blockdev($disk);
- # we should already have checked if it is in use in the api call
- # but we check again for safety
+ # we should already have checked these in the api call, but we check again for safety
+ die "$disk is a partition\n" if is_partition($disk);
die "disk $disk is already in use\n" if disk_is_used($disk);
my $id = $uuid || 'R';
@@ -798,6 +798,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);
--
2.30.2
next prev parent reply other threads:[~2021-09-28 11:40 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-28 11:39 [pve-devel] [PATCH-SERIES storage/widget-toolkit/manager] disk creation and wiping improvements Fabian Ebner
2021-09-28 11:39 ` [pve-devel] [PATCH storage 01/10] api: disks: create: re-check disk after fork/lock Fabian Ebner
2021-09-30 16:06 ` [pve-devel] applied: " Thomas Lamprecht
2021-09-28 11:39 ` [pve-devel] [PATCH storage 02/10] api: disk: work around udev bug to ensure its database is updated Fabian Ebner
2021-09-30 16:08 ` [pve-devel] applied: " Thomas Lamprecht
2021-09-28 11:39 ` [pve-devel] [PATCH storage 03/10] diskmanage: add change_parttype helper Fabian Ebner
2021-09-28 11:39 ` [pve-devel] [PATCH storage 04/10] diskmanage: wipe blockdev: also change partition type Fabian Ebner
2021-09-28 11:39 ` [pve-devel] [PATCH storage 05/10] diskmanage: don't set usage for unused partitions Fabian Ebner
2021-09-28 11:39 ` Fabian Ebner [this message]
2021-09-30 16:02 ` [pve-devel] [PATCH storage 06/10] api: disks: initgpt: explicitly abort for partitions Thomas Lamprecht
2021-10-06 7:11 ` Fabian Ebner
2021-09-28 11:39 ` [pve-devel] [PATCH storage 07/10] diskmanage: allow partitions for get_udev_info Fabian Ebner
2021-09-30 16:10 ` [pve-devel] applied: " Thomas Lamprecht
2021-09-28 11:39 ` [pve-devel] [PATCH storage 08/10] diskmanage: allow passing partitions to get_disks Fabian Ebner
2021-09-30 16:10 ` [pve-devel] applied: " Thomas Lamprecht
2021-09-28 11:39 ` [pve-devel] [PATCH storage 09/10] partially fix #2285: api: disks: allow partitions for creation paths Fabian Ebner
2021-09-28 11:39 ` [pve-devel] [PATCH storage 10/10] api: disks: create: set correct partition type Fabian Ebner
2021-09-28 11:39 ` [pve-devel] [PATCH widget-toolkit 1/2] (multi) disk selector: allow requesting partitions too Fabian Ebner
2021-09-30 16:13 ` [pve-devel] applied: " Thomas Lamprecht
2021-09-28 11:39 ` [pve-devel] [PATCH widget-toolkit 2/2] disk list: allow wiping individual partitions Fabian Ebner
2021-09-28 11:39 ` [pve-devel] [PATCH manager 1/9] api: ceph: create osd: re-check disk requirements after fork/lock Fabian Ebner
2021-09-30 16:12 ` [pve-devel] applied: " Thomas Lamprecht
2021-09-28 11:39 ` [pve-devel] [PATCH manager 2/9] api: check: create osd: use wipe_blockdev from the Diskmanage package Fabian Ebner
2021-09-30 16:12 ` [pve-devel] applied: " Thomas Lamprecht
2021-09-28 11:39 ` [pve-devel] [PATCH manager 3/9] api: ceph: create osd: work around udev bug Fabian Ebner
2021-09-30 16:12 ` [pve-devel] applied: " Thomas Lamprecht
2021-09-28 11:39 ` [pve-devel] [PATCH manager 4/9] api: ceph: create osd: set correct parttype for DB/WAL Fabian Ebner
2021-09-28 11:39 ` [pve-devel] [RFC manager 5/9] partially fix #2285: api: ceph: create osd: allow using partitions Fabian Ebner
2021-09-28 11:39 ` [pve-devel] [RFC manager 6/9] api: ceph: create osd: set correct partition type Fabian Ebner
2021-09-28 11:39 ` [pve-devel] [RFC manager 7/9] partially fix #2285: ui: ceph: allow selecting partitions Fabian Ebner
2021-09-28 11:40 ` [pve-devel] [PATCH manager 8/9] ui: zfs create: switch to using widget-toolkit's multiDiskSelector Fabian Ebner
2021-09-28 11:40 ` [pve-devel] [PATCH manager 9/9] partially fix #2285: ui: disk create: allow selecting partitions Fabian Ebner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210928114001.164081-7-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox