1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-21 18:03:41 +03:00

firstboot: fill empty color if ansi_color unavailable from os-release

(cherry picked from commit ae0d36c161ef0b8bde08d37674eb500061245728)
This commit is contained in:
afg 2020-09-02 05:20:25 +08:00 committed by Zbigniew Jędrzejewski-Szmek
parent 9678a3daf6
commit 61d29b7f8c

View File

@ -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);