except for migration, where it would be subtly backwards-incompatible. Also allows to get rid of the existing filtering hack in rescan().
Signed-off-by: Fabian Ebner <f.eb...@proxmox.com> --- Dependency bump for pve-storage is needed. src/PVE/LXC.pm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index 6395d12..7e6f378 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -836,7 +836,7 @@ sub destroy_lxc_container { }); if ($purge_unreferenced) { # also remove unreferenced disk - my $vmdisks = PVE::Storage::vdisk_list($storage_cfg, undef, $vmid); + my $vmdisks = PVE::Storage::vdisk_list($storage_cfg, undef, $vmid, undef, 'rootdir'); PVE::Storage::foreach_volid($vmdisks, sub { my ($volid, $sid, $volname, $d) = @_; eval { PVE::Storage::vdisk_free($storage_cfg, $volid) }; @@ -2042,7 +2042,7 @@ sub update_unused { sub scan_volids { my ($cfg, $vmid) = @_; - my $info = PVE::Storage::vdisk_list($cfg, undef, $vmid); + my $info = PVE::Storage::vdisk_list($cfg, undef, $vmid, undef, 'rootdir'); my $all_volumes = {}; foreach my $storeid (keys %$info) { @@ -2062,12 +2062,6 @@ sub rescan { my $cfg = PVE::Storage::config(); - # FIXME: Remove once our RBD plugin can handle CT and VM on a single storage - # see: https://pve.proxmox.com/pipermail/pve-devel/2018-July/032900.html - foreach my $stor (keys %{$cfg->{ids}}) { - delete($cfg->{ids}->{$stor}) if !$cfg->{ids}->{$stor}->{content}->{rootdir}; - } - print "rescan volumes...\n"; my $all_volumes = scan_volids($cfg, $vmid); -- 2.20.1 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel