d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efibootmgr: Use returned error code for error message, not errno

Browse Source 
efivar_unix_path_to_device_path returns the error code, it does not set errno.

Reviewed by:	imp
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D26852
This commit is contained in:
Ryan Moeller 2020-10-19 10:38:40 +00:00
parent 665c8c3e7d
commit b8adbe1c15
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.sbin/efibootmgr/efibootmgr.c
View File

@ -674,11 +674,16 @@ make_boot_var(const char *label, const char *loader, const char *kernel, const c
err(1, "bootvar creation");
if (loader == NULL)
errx(1, "Must specify boot loader");
if (efivar_unix_path_to_device_path(loader, &loaderdp) != 0)
err(1, "Cannot translate unix loader path '%s' to UEFI", loader);
ret = efivar_unix_path_to_device_path(loader, &loaderdp);
if (ret != 0)
errc(1, ret, "Cannot translate unix loader path '%s' to UEFI",
loader);
if (kernel != NULL) {
if (efivar_unix_path_to_device_path(kernel, &kerneldp) != 0)
err(1, "Cannot translate unix kernel path '%s' to UEFI", kernel);
ret = efivar_unix_path_to_device_path(kernel, &kerneldp);
if (ret != 0)
errc(1, ret,
"Cannot translate unix kernel path '%s' to UEFI",
kernel);
} else {
kerneldp = NULL;
}