]> git.proxmox.com Git - pve-container.git/commitdiff
Decide whether volume is added as unused in subclass
authorFabian Grünbichler <f.gruenbichler@proxmox.com>
Mon, 7 Mar 2016 11:39:28 +0000 (12:39 +0100)
committerDietmar Maurer <dietmar@proxmox.com>
Tue, 8 Mar 2016 10:36:30 +0000 (11:36 +0100)
follow the change in PVE::AbstractConfig

src/PVE/LXC/Config.pm
src/test/snapshot-expected/delete/lxc/105.conf

index ff8f7b3c4b0b234e0359a197b3e7a4bfe5217648..ef0673cd2ffff19457a853908849c6265cb739b5 100644 (file)
@@ -121,10 +121,11 @@ sub __snapshot_delete_vmstate_file {
 }
 
 sub __snapshot_delete_vol_snapshot {
 }
 
 sub __snapshot_delete_vol_snapshot {
-    my ($class, $vmid, $ms, $mountpoint, $snapname) = @_;
+    my ($class, $vmid, $ms, $mountpoint, $snapname, $unused) = @_;
 
     my $storecfg = PVE::Storage::config();
     PVE::Storage::volume_snapshot_delete($storecfg, $mountpoint->{volume}, $snapname);
 
     my $storecfg = PVE::Storage::config();
     PVE::Storage::volume_snapshot_delete($storecfg, $mountpoint->{volume}, $snapname);
+    push @$unused, $mountpoint->{volume};
 }
 
 sub __snapshot_rollback_vol_possible {
 }
 
 sub __snapshot_rollback_vol_possible {
index b5a2837346a94d57aa8e5de2091c27bb287a26cb..c6d04c9227f372fb0201e1742b5e08c710d57eaf 100644 (file)
@@ -7,4 +7,3 @@ net0: bridge=vmbr0,hwaddr=12:34:56:78:90:12,ip=dhcp,ip6=dhcp,name=eth0,type=veth
 ostype: redhat
 rootfs: local:snapshotable-disk-1
 swap: 512
 ostype: redhat
 rootfs: local:snapshotable-disk-1
 swap: 512
-unused0: local:unsnapshotable-disk-1