summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2021-11-23 14:08:01 +0100
committerLennart Poettering <lennart@poettering.net>2021-11-23 22:40:15 +0100
commitae54abe7fe239f1606a4becc2a41f2d7530371a2 (patch)
tree8ebbba033f16dcecc63a669ce5b69e489bbe9403
parent3131c24bd61ee25a63494594e1cfb02ae5382e58 (diff)
downloadsystemd-ae54abe7fe239f1606a4becc2a41f2d7530371a2.tar.gz
bootctl: use new red/green check/cross mark helpers at two places
-rw-r--r--src/boot/bootctl.c6
-rw-r--r--src/test/test-gpt.c5
2 files changed, 5 insertions, 6 deletions
diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index c19a51de62..07ad949a0c 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -1240,11 +1240,9 @@ static void read_efi_var(const char *variable, char **ret) {
}
static void print_yes_no_line(bool first, bool good, const char *name) {
- printf("%s%s%s%s %s\n",
+ printf("%s%s %s\n",
first ? " Features: " : " ",
- ansi_highlight_green_red(good),
- special_glyph_check_mark(good),
- ansi_normal(),
+ COLOR_MARK_BOOL(good),
name);
}
diff --git a/src/test/test-gpt.c b/src/test/test-gpt.c
index 9b0eb57373..7ee044ba50 100644
--- a/src/test/test-gpt.c
+++ b/src/test/test-gpt.c
@@ -4,6 +4,7 @@
#include "glyph-util.h"
#include "gpt.h"
#include "log.h"
+#include "pretty-print.h"
#include "strv.h"
#include "terminal-util.h"
#include "tests.h"
@@ -32,11 +33,11 @@ static void test_gpt_types_against_architectures(void) {
r = gpt_partition_type_uuid_from_string(joined, &id);
if (r < 0) {
- printf("%s%s%s %s\n", ansi_highlight_red(), special_glyph(SPECIAL_GLYPH_CROSS_MARK), ansi_normal(), joined);
+ printf("%s %s\n", RED_CROSS_MARK(), joined);
continue;
}
- printf("%s%s%s %s\n", ansi_highlight_green(), special_glyph(SPECIAL_GLYPH_CHECK_MARK), ansi_normal(), joined);
+ printf("%s %s\n", GREEN_CHECK_MARK(), joined);
if (streq(prefix, "root-") && streq(suffix, ""))
assert_se(gpt_partition_type_is_root(id));