picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bootctl: don't accidentally propagate errors in "bootctl status" 

Fixes: #16989
This commit is contained in:
Lennart Poettering 2020-09-09 23:04:17 +02:00
parent 293772c27a
commit c1b9708c10
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/boot/bootctl.c
View File

@ -1231,15 +1231,15 @@ static int verb_status(int argc, char *argv[], void *userdata) {
printf(" Secure Boot: %sd\n", enable_disable(is_efi_secure_boot()));
printf(" Setup Mode: %s\n", is_efi_secure_boot_setup_mode() ? "setup" : "user");
r = efi_get_reboot_to_firmware();
if (r > 0)
k = efi_get_reboot_to_firmware();
if (k > 0)
printf(" Boot into FW: %sactive%s\n", ansi_highlight_yellow(), ansi_normal());
else if (r == 0)
else if (k == 0)
printf(" Boot into FW: supported\n");
else if (r == -EOPNOTSUPP)
else if (k == -EOPNOTSUPP)
printf(" Boot into FW: not supported\n");
else {
errno = -r;
errno = -k;
printf(" Boot into FW: %sfailed%s (%m)\n", ansi_highlight_red(), ansi_normal());
}
printf("\n");