to have a clear method name for this. check_XYZ suggests also that we
return true if the check was OK, but we don't.
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
my $type = $param->{filesystem} // 'ext4';
$dev = PVE::Diskmanage::verify_blockdev_path($dev);
my $type = $param->{filesystem} // 'ext4';
$dev = PVE::Diskmanage::verify_blockdev_path($dev);
- PVE::Diskmanage::check_unused($dev);
+ PVE::Diskmanage::assert_disk_unused($dev);
PVE::Storage::assert_sid_unused($name) if $param->{add_storage};
my $worker = sub {
PVE::Storage::assert_sid_unused($name) if $param->{add_storage};
my $worker = sub {
my $node = $param->{node};
$dev = PVE::Diskmanage::verify_blockdev_path($dev);
my $node = $param->{node};
$dev = PVE::Diskmanage::verify_blockdev_path($dev);
- PVE::Diskmanage::check_unused($dev);
+ PVE::Diskmanage::assert_disk_unused($dev);
PVE::Storage::assert_sid_unused($name) if $param->{add_storage};
my $worker = sub {
PVE::Storage::assert_sid_unused($name) if $param->{add_storage};
my $worker = sub {
my $node = $param->{node};
$dev = PVE::Diskmanage::verify_blockdev_path($dev);
my $node = $param->{node};
$dev = PVE::Diskmanage::verify_blockdev_path($dev);
- PVE::Diskmanage::check_unused($dev);
+ PVE::Diskmanage::assert_disk_unused($dev);
PVE::Storage::assert_sid_unused($name) if $param->{add_storage};
my $worker = sub {
PVE::Storage::assert_sid_unused($name) if $param->{add_storage};
my $worker = sub {
foreach my $dev (@$devs) {
$dev = PVE::Diskmanage::verify_blockdev_path($dev);
foreach my $dev (@$devs) {
$dev = PVE::Diskmanage::verify_blockdev_path($dev);
- PVE::Diskmanage::check_unused($dev);
+ PVE::Diskmanage::assert_disk_unused($dev);
}
PVE::Storage::assert_sid_unused($name) if $param->{add_storage};
}
PVE::Storage::assert_sid_unused($name) if $param->{add_storage};
+sub assert_disk_unused {
- die "device $dev is already in use\n" if disk_is_used($dev);
+ die "device '$dev' is already in use\n" if disk_is_used($dev);