On Mon, Apr 19, 2021 at 07:14:16PM +0200, Pavel Hrdina wrote:
Future patch will remove MKFS define as we will no longer check it during compilation.
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/storage/storage_backend_fs.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index bb93d64bbe..b0f8070c6c 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -397,13 +397,20 @@ virStorageBackendFileSystemCheck(virStoragePoolObj *pool, return 0; }
-/* some platforms don't support mkfs */ -#ifdef MKFS static int virStorageBackendExecuteMKFS(const char *device, const char *format) { g_autoptr(virCommand) cmd = NULL; + g_autofree char *mkfs = virFindFileInPath(MKFS); + + if (!mkfs) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("mkfs is not supported on this platform: "
s/supported/available/ since it may simply be uninstalled now.
+ "Failed to make filesystem of type '%s' on device '%s'"), + format, device); + return -1; + }
Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|