[libvirt] [PATCH] Eliminate failure to delete empty storage pools
virStorageBackendFileSystemDelete was incorrectly calling unlink() in
an attempt to remove a directory. It should be calling rmdir()
instead. (remove() would also work, but could potentially succeed on a
non-empty pool if the pool was a symlink to somewhere else).
---
src/storage/storage_backend_fs.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index 16e4bd9..b7d4bd6 100644
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -693,9 +693,9 @@ virStorageBackendFileSystemDelete(virConnectPtr conn,
{
/* XXX delete all vols first ? */
- if (unlink(pool->def->target.path) < 0) {
+ if (rmdir(pool->def->target.path) < 0) {
virReportSystemError(conn, errno,
- _("cannot unlink path '%s'"),
+ _("failed to remove pool '%s'"),
pool->def->target.path);
return -1;
}
--
1.6.6.rc2.5.g49666