Fail if xorriso failed.
If xorriso failed most likely we didn't generate a meaningful image.
This commit is contained in:
parent
1fd3a7f048
commit
184d71d527
1 changed files with 4 additions and 2 deletions
|
@ -429,6 +429,7 @@ main (int argc, char *argv[])
|
||||||
char **argp_argv;
|
char **argp_argv;
|
||||||
int xorriso_tail_argc;
|
int xorriso_tail_argc;
|
||||||
char **xorriso_tail_argv;
|
char **xorriso_tail_argv;
|
||||||
|
int rv;
|
||||||
|
|
||||||
grub_util_host_init (&argc, &argv);
|
grub_util_host_init (&argc, &argv);
|
||||||
grub_util_disable_fd_syncs ();
|
grub_util_disable_fd_syncs ();
|
||||||
|
@ -794,7 +795,6 @@ main (int argc, char *argv[])
|
||||||
free (efidir_efi_boot);
|
free (efidir_efi_boot);
|
||||||
|
|
||||||
efiimgfat = grub_util_path_concat (2, iso9660_dir, "efi.img");
|
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",
|
rv = grub_util_exec ((const char * []) { "mformat", "-C", "-f", "2880", "-L", "16", "-i",
|
||||||
efiimgfat, "::", NULL });
|
efiimgfat, "::", NULL });
|
||||||
if (rv != 0)
|
if (rv != 0)
|
||||||
|
@ -967,7 +967,9 @@ main (int argc, char *argv[])
|
||||||
|
|
||||||
xorriso_argv[xorriso_argc] = NULL;
|
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);
|
grub_util_unlink_recursive (iso9660_dir);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue