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.k...@proxmox.com>
---
changes since v2:
* rename helper from *_supported to *_available
* lower/remove storage_check_enabled to storage_config where possible
due to the helper already checking that
* change of vdisk_alloc signature with required $vtype
src/PVE/LXC.pm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
index 4209233..799aa9a 100644
--- a/src/PVE/LXC.pm
+++ b/src/PVE/LXC.pm
@@ -2173,8 +2173,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_available($storecfg, $storage,
'rootdir');
my $is_unsized_on_path = $scfg->{path} && $size_kb <= 0;
my $is_btrfs_quotas = $scfg->{type} eq 'btrfs' && $scfg->{quotas};
@@ -2187,7 +2186,8 @@ 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, 'rootdir', $size_kb);
format_disk($storecfg, $volid, $root_uid, $root_gid) if $do_format;
};
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
