1300d7b633
Resolves: rhbz#1484609 Get rid of the temporary extra efi packages hack. Signed-off-by: Peter Jones <pjones@redhat.com>
45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
From e66dc5d71ebfc9763420a76c274e6980d54641c3 Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
Date: Mon, 7 Aug 2017 18:08:39 +0200
|
|
Subject: [PATCH 055/194] Fail if xorriso failed.
|
|
|
|
If xorriso failed most likely we didn't generate a meaningful image.
|
|
---
|
|
util/grub-mkrescue.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c
|
|
index 38f154397..9545945d8 100644
|
|
--- a/util/grub-mkrescue.c
|
|
+++ b/util/grub-mkrescue.c
|
|
@@ -429,6 +429,7 @@ main (int argc, char *argv[])
|
|
char **argp_argv;
|
|
int xorriso_tail_argc;
|
|
char **xorriso_tail_argv;
|
|
+ int rv;
|
|
|
|
grub_util_host_init (&argc, &argv);
|
|
grub_util_disable_fd_syncs ();
|
|
@@ -794,7 +795,6 @@ main (int argc, char *argv[])
|
|
free (efidir_efi_boot);
|
|
|
|
efiimgfat = grub_util_path_concat (2, iso9660_dir, "efi.img");
|
|
- int rv;
|
|
rv = grub_util_exec ((const char * []) { "mformat", "-C", "-f", "2880", "-L", "16", "-i",
|
|
efiimgfat, "::", NULL });
|
|
if (rv != 0)
|
|
@@ -967,7 +967,9 @@ main (int argc, char *argv[])
|
|
|
|
xorriso_argv[xorriso_argc] = NULL;
|
|
|
|
- grub_util_exec ((const char *const *)xorriso_argv);
|
|
+ rv = grub_util_exec ((const char *const *)xorriso_argv);
|
|
+ if (rv != 0)
|
|
+ grub_util_error ("`%s` invocation failed\n", "xorriso");
|
|
|
|
grub_util_unlink_recursive (iso9660_dir);
|
|
|
|
--
|
|
2.13.5
|
|
|