From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 25 Jun 2018 04:40:36 +0000 (+0900)
Subject: bootctl: drop dead code
X-Git-Tag: v240~1051^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=33987ba0c2a91585dd4a53e9aaff1e9ffcfa38b3;p=thirdparty%2Fsystemd.git

bootctl: drop dead code
---

diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index 2832a39dd78..b74129a5f0d 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -950,18 +950,8 @@ static int verb_status(int argc, char *argv[], void *userdata) {
 
                 printf("System:\n");
                 printf("     Firmware: %s (%s)\n", strna(fw_type), strna(fw_info));
-
-                k = is_efi_secure_boot();
-                if (k < 0)
-                        r = log_warning_errno(k, "Failed to query secure boot status: %m");
-                else
-                        printf("  Secure Boot: %sd\n", enable_disable(k));
-
-                k = is_efi_secure_boot_setup_mode();
-                if (k < 0)
-                        r = log_warning_errno(k, "Failed to query secure boot mode: %m");
-                else
-                        printf("   Setup Mode: %s\n", k ? "setup" : "user");
+                printf("  Secure Boot: %sd\n", enable_disable(is_efi_secure_boot()));
+                printf("   Setup Mode: %s\n", is_efi_secure_boot_setup_mode() ? "setup" : "user");
                 printf("\n");
 
                 printf("Current Loader:\n");