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

pvesm list fix

Browse Source
This commit is contained in:
Alen Grizonic
2015-09-28 10:16:33 +02:00
committed by Dietmar Maurer
parent 399581a2b3
commit ba0cf557f4
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
PVE/API2/Storage/Content.pm
View File

@ -67,6 +67,8 @@ __PACKAGE__->register_method ({
my $storeid = $param->{storage}; my $storeid = $param->{storage};
my $vmid = $param->{vmid};
my $cfg = cfs_read_file("storage.cfg"); my $cfg = cfs_read_file("storage.cfg");
my $scfg = PVE::Storage::storage_config($cfg, $storeid); my $scfg = PVE::Storage::storage_config($cfg, $storeid);
@ -74,14 +76,19 @@ __PACKAGE__->register_method ({
my $res = []; my $res = [];
foreach my $ct (@$cts) { foreach my $ct (@$cts) {
my $data; my $data;
if ($ct eq 'images' || defined($param->{vmid})) { if ($ct eq 'images') {
$data = PVE::Storage::vdisk_list ($cfg, $storeid, $param->{vmid}); $data = PVE::Storage::vdisk_list ($cfg, $storeid, $param->{vmid});
} elsif ($ct eq 'iso') { } elsif ($ct eq 'iso' && !defined($param->{vmid})) {
$data = PVE::Storage::template_list ($cfg, $storeid, 'iso'); $data = PVE::Storage::template_list ($cfg, $storeid, 'iso');
} elsif ($ct eq 'vztmpl') { } elsif ($ct eq 'vztmpl'&& !defined($param->{vmid})) {
$data = PVE::Storage::template_list ($cfg, $storeid, 'vztmpl'); $data = PVE::Storage::template_list ($cfg, $storeid, 'vztmpl');
} elsif ($ct eq 'backup') { } elsif ($ct eq 'backup') {
$data = PVE::Storage::template_list ($cfg, $storeid, 'backup'); $data = PVE::Storage::template_list ($cfg, $storeid, 'backup');
foreach my $item (@{$data->{$storeid}}) {
if (defined($vmid)) {
@{$data->{$storeid}} = grep { $_->{volid} =~ m/\S+-$vmid-\S+/ } @{$data->{$storeid}};
}
}
} }
next if !$data || !$data->{$storeid}; next if !$data || !$data->{$storeid};