From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 9 Sep 2020 21:04:17 +0000 (+0200)
Subject: bootctl: don't accidentally propagate errors in "bootctl status"
X-Git-Tag: v247-rc1~266
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c1b9708c109376578b08a97a64a34936b33463e1;p=thirdparty%2Fsystemd.git

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

Fixes: #16989
---

diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index 94bd1788f8d..4c84421f22f 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -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");