mkrescue: Check xorriso presence before doing anything else.
mkrescue can't do anything useful without xorriso, so abort early if it's not available.
This commit is contained in:
parent
682b3134b6
commit
1fd3a7f048
1 changed files with 8 additions and 1 deletions
|
@ -323,6 +323,7 @@ check_xorriso (const char *val)
|
|||
char *buf = NULL;
|
||||
size_t len = 0;
|
||||
int ret = 0;
|
||||
int wstatus = 0;
|
||||
|
||||
argv[0] = xorriso;
|
||||
argv[1] = "-as";
|
||||
|
@ -347,8 +348,10 @@ check_xorriso (const char *val)
|
|||
}
|
||||
|
||||
close (fd);
|
||||
waitpid (pid, NULL, 0);
|
||||
waitpid (pid, &wstatus, 0);
|
||||
free (buf);
|
||||
if (!WIFEXITED (wstatus) || WEXITSTATUS(wstatus) != 0)
|
||||
return 0;
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -478,6 +481,10 @@ main (int argc, char *argv[])
|
|||
if (!output_image)
|
||||
grub_util_error ("%s", _("output file must be specified"));
|
||||
|
||||
if (!check_xorriso ("graft-points")) {
|
||||
grub_util_error ("%s", _("xorriso not found"));
|
||||
}
|
||||
|
||||
grub_init_all ();
|
||||
grub_hostfs_init ();
|
||||
grub_host_init ();
|
||||
|
|
Loading…
Reference in a new issue