From be78543909cc2bdf763c1f93c85182c80b89d396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Tue, 6 Aug 2019 09:23:19 +0200 Subject: [PATCH] fix 2317: list images on 'rootdir' only storages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit plugins can still override list_volumes if they want separate methods to list rootdir and images content. Signed-off-by: Fabian Grünbichler --- PVE/Storage.pm | 2 +- PVE/Storage/Plugin.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PVE/Storage.pm b/PVE/Storage.pm index 7376dbf..755eca8 100755 --- a/PVE/Storage.pm +++ b/PVE/Storage.pm @@ -845,7 +845,7 @@ sub template_list { sub volume_list { my ($cfg, $storeid, $vmid, $content) = @_; - my @ctypes = qw(images vztmpl iso backup snippets); + my @ctypes = qw(rootdir images vztmpl iso backup snippets); my $cts = $content ? [ $content ] : [ @ctypes ]; diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm index 08ec749..27f832f 100644 --- a/PVE/Storage/Plugin.pm +++ b/PVE/Storage/Plugin.pm @@ -954,7 +954,7 @@ sub list_volumes { foreach my $ct (@$content_types) { my $data; - if ($ct eq 'images') { + if ($ct eq 'images' || $ct eq 'rootdir') { $data = $class->list_images($storeid, $scfg, $vmid); } elsif ($scfg->{path}) { my $path = $class->get_subdir($scfg, $ct);