mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-23 04:55:18 +00:00
storage_backend_fs: use MKFS ony if WITH_STORAGE_FS is defined
The code in storage_backend_fs is used for storage_dir and storage_fs drivers so some parts need to be guarded by checking for WITH_STORAGE_FS. Fixes: 16c69e7aaed4cabfd8e8c19cc326854d4c480437 Signed-off-by: Pavel Hrdina <phrdina@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
a85d553d76
commit
9c81d1ec11
@ -402,7 +402,11 @@ virStorageBackendExecuteMKFS(const char *device,
|
||||
const char *format)
|
||||
{
|
||||
g_autoptr(virCommand) cmd = NULL;
|
||||
g_autofree char *mkfs = virFindFileInPath(MKFS);
|
||||
g_autofree char *mkfs = NULL;
|
||||
|
||||
#if WITH_STORAGE_FS
|
||||
mkfs = virFindFileInPath(MKFS);
|
||||
#endif /* WITH_STORAGE_FS */
|
||||
|
||||
if (!mkfs) {
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||
@ -412,7 +416,7 @@ virStorageBackendExecuteMKFS(const char *device,
|
||||
return -1;
|
||||
}
|
||||
|
||||
cmd = virCommandNewArgList(MKFS, "-t", format, NULL);
|
||||
cmd = virCommandNewArgList(mkfs, "-t", format, NULL);
|
||||
|
||||
/* use the force, otherwise mkfs.xfs won't overwrite existing fs.
|
||||
* Similarly mkfs.ext2, mkfs.ext3, and mkfs.ext4 require supplying -F
|
||||
|
Loading…
x
Reference in New Issue
Block a user