]> git.proxmox.com Git - pve-container.git/commitdiff
destroy owned mountpoints on pct destroy
authorWolfgang Bumiller <w.bumiller@proxmox.com>
Tue, 1 Sep 2015 14:33:54 +0000 (16:33 +0200)
committerDietmar Maurer <dietmar@proxmox.com>
Thu, 3 Sep 2015 09:15:01 +0000 (11:15 +0200)
src/PVE/LXC.pm

index 1c9c1a54f7d3613ecd6ddcdd91fc42f92cc4d8bf..1b705c5a80a24e3ab4f0939a23319e4c709aec75 100644 (file)
@@ -1244,11 +1244,12 @@ sub get_primary_ips {
 sub destroy_lxc_container {
     my ($storage_cfg, $vmid, $conf) = @_;
 
-    my $rootinfo = parse_ct_mountpoint($conf->{rootfs});
-    if (defined($rootinfo->{volume})) {
-       my ($vtype, $name, $owner) = PVE::Storage::parse_volname($storage_cfg, $rootinfo->{volume});
-       PVE::Storage::vdisk_free($storage_cfg, $rootinfo->{volume}) if $vmid == $owner;;
-    }
+    foreach_mountpoint($conf, sub {
+       my ($ms, $mountpoint) = @_;
+       my ($vtype, $name, $owner) = PVE::Storage::parse_volname($storage_cfg, $mountpoint->{volume});
+       PVE::Storage::vdisk_free($storage_cfg, $mountpoint->{volume}) if $vmid == $owner;
+    });
+
     rmdir "/var/lib/lxc/$vmid/rootfs";
     unlink "/var/lib/lxc/$vmid/config";
     rmdir "/var/lib/lxc/$vmid";