Error out if mtools invocation fails.

diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c
index da0dc021a5f912e531da9332c93938f25fdb1c64..238d4840e2f9613c6392e16cb88e7f413cae41c4 100644 (file)
--- a/util/grub-mkrescue.c
+++ b/util/grub-mkrescue.c
@@ -787,9 +787,14 @@ main (int argc, char *argv[])
       free (efidir_efi_boot);
 
       efiimgfat = grub_util_path_concat (2, iso9660_dir, "efi.img");
-      grub_util_exec ((const char * []) { "mformat", "-C", "-f", "2880", "-L", "16", "-i",
+      int rv;
+      rv = grub_util_exec ((const char * []) { "mformat", "-C", "-f", "2880", "-L", "16", "-i",
            efiimgfat, "::", NULL });
-      grub_util_exec ((const char * []) { "mcopy", "-s", "-i", efiimgfat, efidir_efi, "::/", NULL });
+      if (rv != 0)
+       grub_util_error ("`%s` invocation failed\n", "mformat");
+      rv = grub_util_exec ((const char * []) { "mcopy", "-s", "-i", efiimgfat, efidir_efi, "::/", NULL });
+      if (rv != 0)
+       grub_util_error ("`%s` invocation failed\n", "mformat");
       xorriso_push ("--efi-boot");
       xorriso_push ("efi.img");
       xorriso_push ("-efi-boot-part");