From 4ed9e2619c630679b2fac1fc0eb4ab4b55f02871 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 28 Sep 2023 10:45:49 +0200 Subject: [PATCH] bootctl: highlight SecureBoot enabled state in green --- src/basic/string-util.h | 4 ++++ src/boot/bootctl-status.c | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/basic/string-util.h b/src/basic/string-util.h index 72f791f6ccb..6b6a5746fe6 100644 --- a/src/basic/string-util.h +++ b/src/basic/string-util.h @@ -68,6 +68,10 @@ static inline const char* enable_disable(bool b) { return b ? "enable" : "disable"; } +static inline const char* enabled_disabled(bool b) { + return b ? "enabled" : "disabled"; +} + /* This macro's return pointer will have the "const" qualifier set or unset the same way as the input * pointer. */ #define empty_to_null(p) \ diff --git a/src/boot/bootctl-status.c b/src/boot/bootctl-status.c index 00bc0a91c2c..033abb05665 100644 --- a/src/boot/bootctl-status.c +++ b/src/boot/bootctl-status.c @@ -410,9 +410,15 @@ int verb_status(int argc, char *argv[], void *userdata) { printf("%sSystem:%s\n", ansi_underline(), ansi_normal()); printf(" Firmware: %s%s (%s)%s\n", ansi_highlight(), strna(fw_type), strna(fw_info), ansi_normal()); printf(" Firmware Arch: %s\n", get_efi_arch()); - printf(" Secure Boot: %sd (%s)\n", - enable_disable(IN_SET(secure, SECURE_BOOT_USER, SECURE_BOOT_DEPLOYED)), - secure_boot_mode_to_string(secure)); + printf(" Secure Boot: %s%s%s", + IN_SET(secure, SECURE_BOOT_USER, SECURE_BOOT_DEPLOYED) ? ansi_highlight_green() : ansi_normal(), + enabled_disabled(IN_SET(secure, SECURE_BOOT_USER, SECURE_BOOT_DEPLOYED)), + ansi_normal()); + + if (secure != SECURE_BOOT_DISABLED) + printf(" (%s)\n", secure_boot_mode_to_string(secure)); + else + printf("\n"); s = tpm2_support(); printf(" TPM2 Support: %s%s%s\n", -- 2.47.3