yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 2317: list images on 'rootdir' only storages

Browse Source 
plugins can still override list_volumes if they want separate methods to
list rootdir and images content.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler
2019-08-06 09:23:19 +02:00
committed by Wolfgang Bumiller
parent 4dfc2ff21e
commit be78543909
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PVE/Storage.pm
View File

@ -845,7 +845,7 @@ sub template_list {
sub volume_list { sub volume_list {
my ($cfg, $storeid, $vmid, $content) = @_; 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 ]; my $cts = $content ? [ $content ] : [ @ctypes ];

2
PVE/Storage/Plugin.pm
View File

@ -954,7 +954,7 @@ sub list_volumes {
foreach my $ct (@$content_types) { foreach my $ct (@$content_types) {
my $data; my $data;
if ($ct eq 'images') { if ($ct eq 'images' || $ct eq 'rootdir') {
$data = $class->list_images($storeid, $scfg, $vmid); $data = $class->list_images($storeid, $scfg, $vmid);
} elsif ($scfg->{path}) { } elsif ($scfg->{path}) {
my $path = $class->get_subdir($scfg, $ct); my $path = $class->get_subdir($scfg, $ct);