diff options
author | Lennart Poettering <lennart@poettering.net> | 2014-02-17 16:17:08 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2014-02-17 16:17:08 +0100 |
commit | b6e2f3293d0f9a821819d96038eec2a19062151f (patch) | |
tree | 579e7137cef08b164b4f8d1c8e0acfd8acc1fac7 /src/shared/util.c | |
parent | 3d0ce78b257dccda0e377dfef580abfa11437fe8 (diff) |
core: fixate show_status earlier, so that we actually print the welcome message
Previously, we'd fixed show_state only after printing the welcome
message which had the effect that the welcome message was almost always
suppressed.
Diffstat (limited to 'src/shared/util.c')
-rw-r--r-- | src/shared/util.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/shared/util.c b/src/shared/util.c index d95a4b4ab1..4f3145b2bc 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -2928,24 +2928,6 @@ int status_printf(const char *status, bool ellipse, bool ephemeral, const char * return r; } -int status_welcome(void) { - _cleanup_free_ char *pretty_name = NULL, *ansi_color = NULL; - int r; - - r = parse_env_file("/etc/os-release", NEWLINE, - "PRETTY_NAME", &pretty_name, - "ANSI_COLOR", &ansi_color, - NULL); - - if (r < 0 && r != -ENOENT) - log_warning("Failed to read /etc/os-release: %s", strerror(-r)); - - return status_printf(NULL, false, false, - "\nWelcome to \x1B[%sm%s\x1B[0m!\n", - isempty(ansi_color) ? "1" : ansi_color, - isempty(pretty_name) ? "Linux" : pretty_name); -} - char *replace_env(const char *format, char **env) { enum { WORD, |