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

Fix #1941: remove empty directories when freeing image on FS based storages

Browse Source 
Remove directories if they are empty, which can happen if all images
from a VM got deleted, e.g., after destroying said VM.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
This commit is contained in:
Christian Ebner
2019-01-24 14:58:22 +01:00
committed by Thomas Lamprecht
parent 4e8de9ad56
commit 712e27f178
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PVE/Storage/Plugin.pm
View File

@ -5,6 +5,7 @@ use warnings;
use File::chdir; use File::chdir;
use File::Path; use File::Path;
use File::Basename;
use PVE::Tools qw(run_command); use PVE::Tools qw(run_command);
use PVE::JSONSchema qw(get_standard_option); use PVE::JSONSchema qw(get_standard_option);
@ -689,6 +690,11 @@ sub free_image {
unlink($path) || die "unlink '$path' failed - $!\n"; unlink($path) || die "unlink '$path' failed - $!\n";
} }
# try to cleanup directory to not clutter storage with empty $vmid dirs if
# all images from a guest got deleted
my $dir = dirname($path);
rmdir($dir);
return undef; return undef;
} }