]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
storage: fs: Fix pool building when directory already exists
authorChristophe Fergeau <cfergeau@redhat.com>
Fri, 17 Jul 2015 08:02:20 +0000 (10:02 +0200)
committerChristophe Fergeau <cfergeau@redhat.com>
Fri, 17 Jul 2015 13:29:20 +0000 (15:29 +0200)
Currently, when trying to virsh pool-define/virsh pool-build a new
'dir' pool, if the target directory already exists, virsh
pool-build/virStoragePoolBuild will error out. This is a change of
behaviour compared to eg libvirt 1.2.13

This is caused by the wrong type being used for the dir_create_flags
variable in virStorageBackendFileSystemBuild , it's defined as a bool
but is used as a flag bit field so should be unsigned int (this matches
the type virDirCreate expects for this variable).

This should fix https://bugzilla.gnome.org/show_bug.cgi?id=752417 (GNOME
Boxes) and https://bugzilla.redhat.com/show_bug.cgi?id=1244080
(downstream virt-manager).

src/storage/storage_backend_fs.c

index 337b8d3b92897256913290bc3af0f176b49cf0e2..17130c0948d230640fafd457a4cd56e6bcc3c37d 100644 (file)
@@ -770,7 +770,8 @@ virStorageBackendFileSystemBuild(virConnectPtr conn ATTRIBUTE_UNUSED,
     char *parent = NULL;
     char *p = NULL;
     mode_t mode;
-    bool needs_create_as_uid, dir_create_flags;
+    bool needs_create_as_uid;
+    unsigned int dir_create_flags;
 
     virCheckFlags(VIR_STORAGE_POOL_BUILD_OVERWRITE |
                   VIR_STORAGE_POOL_BUILD_NO_OVERWRITE, ret);