From 20fb9aa3f15f9d3ef89bfc3784d72a791c55b757 Mon Sep 17 00:00:00 2001 From: Friedrich Weber Date: Thu, 15 Jun 2023 15:22:31 +0200 Subject: [PATCH] pve7to8: content-dirs check: skip paths that cannot be resolved The current inequality check for content-dirs does not correctly handle the case in which `abs_path` returns undef. This can result in confusing warnings: storage [...] uses directory for multiple content types [...] Fix this by skipping paths for which `abs_path` returns undef. This matches the behavior of the actual content-dirs check in PVE 8 [0]. [0]: https://git.proxmox.com/?p=pve-storage.git;a=commit;h=09f1f847a Fixes: ea0a4f1943ffafe94282afc800d5720db45df198 Signed-off-by: Friedrich Weber --- PVE/CLI/pve7to8.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/PVE/CLI/pve7to8.pm b/PVE/CLI/pve7to8.pm index 524b0617..73ea85b0 100644 --- a/PVE/CLI/pve7to8.pm +++ b/PVE/CLI/pve7to8.pm @@ -997,6 +997,7 @@ sub check_storage_content_dirs { my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); for my $vtype (keys $scfg->{content}->%*) { my $abs_subdir = Cwd::abs_path($plugin->get_subdir($scfg, $vtype)); + next if !defined($abs_subdir); push $resolved_subdirs->{$abs_subdir}->@*, $vtype; } for my $subdir (keys $resolved_subdirs->%*) {