From 61d29b7f8c57898ba1a15a8fab90fde7c95efbc6 Mon Sep 17 00:00:00 2001 From: afg Date: Wed, 2 Sep 2020 05:20:25 +0800 Subject: [PATCH] firstboot: fill empty color if ansi_color unavailable from os-release (cherry picked from commit ae0d36c161ef0b8bde08d37674eb500061245728) --- src/firstboot/firstboot.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c index a3f442518e..c9fc8dd5cd 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c @@ -94,7 +94,7 @@ static bool press_any_key(void) { static void print_welcome(void) { _cleanup_free_ char *pretty_name = NULL, *ansi_color = NULL; static bool done = false; - const char *pn; + const char *pn, *ac; int r; if (!arg_welcome) @@ -113,9 +113,10 @@ static void print_welcome(void) { "Failed to read os-release file, ignoring: %m"); pn = isempty(pretty_name) ? "Linux" : pretty_name; + ac = isempty(ansi_color) ? "0" : ansi_color; if (colors_enabled()) - printf("\nWelcome to your new installation of \x1B[%sm%s\x1B[0m!\n", ansi_color, pn); + printf("\nWelcome to your new installation of \x1B[%sm%s\x1B[0m!\n", ac, pn); else printf("\nWelcome to your new installation of %s!\n", pn);