[pve-devel] [PATCH container v2 07/11] alloc_disk: use volume content type assertion helpers

[Daniel Kral]

Make use of the newly introduced content type assertion helpers in the
precondition check path and the call to `vdisk_alloc` in the wrapper for
allocating container's disks.

Signed-off-by: Daniel Kral <d.kral at proxmox.com>
---
changes since v1:
- new!

 src/PVE/LXC.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
index 32a54a9..1631f82 100644
--- a/src/PVE/LXC.pm
+++ b/src/PVE/LXC.pm
@@ -2160,8 +2160,7 @@ sub alloc_disk {
 	my $format = 'raw';
 	my $do_format = 0;
 
-	die "storage '$storage' does not support content type 'rootdir'\n"
-	    if !$scfg->{content}->{rootdir};
+	PVE::Storage::assert_content_type_supported($storecfg, $storage, 'rootdir');
 
 	my $is_unsized_on_path = $scfg->{path} && $size_kb <= 0;
 	my $is_btrfs_quotas = $scfg->{path} && $scfg->{type} eq 'btrfs' && $scfg->{quotas};
@@ -2174,7 +2173,9 @@ sub alloc_disk {
 	    $do_format = 1;
 	}
 
-	$volid = PVE::Storage::vdisk_alloc($storecfg, $storage, $vmid, $format, $size_kb);
+	$volid = PVE::Storage::vdisk_alloc($storecfg, $storage, $vmid, $format, $size_kb, {
+	    vtype => 'rootdir',
+	});
 
 	format_disk($storecfg, $volid, $root_uid, $root_gid) if $do_format;
     };
-- 
2.39.5