diff options
| -rw-r--r-- | src/core/main.c | 2 | ||||
| -rw-r--r-- | src/core/manager.c | 4 | ||||
| -rw-r--r-- | src/shared/util.c | 4 | ||||
| -rw-r--r-- | src/shared/util.h | 2 |
4 files changed, 2 insertions, 10 deletions
diff --git a/src/core/main.c b/src/core/main.c index 2d393deb9..dd8b65083 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1561,7 +1561,7 @@ int main(int argc, char *argv[]) { } if (arg_running_as == SYSTEMD_SYSTEM && !skip_setup) { - if (arg_show_status > 0 || plymouth_running()) + if (arg_show_status > 0) status_welcome(); hostname_setup(); diff --git a/src/core/manager.c b/src/core/manager.c index d33112df2..1afd359df 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -3009,9 +3009,7 @@ static bool manager_get_show_status(Manager *m, StatusType type) { if (m->show_status > 0) return true; - /* If Plymouth is running make sure we show the status, so - * that there's something nice to see when people press Esc */ - return plymouth_running(); + return false; } void manager_set_first_boot(Manager *m, bool b) { diff --git a/src/shared/util.c b/src/shared/util.c index 5cbbe8fb7..3f3ca90f5 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -4228,10 +4228,6 @@ bool nulstr_contains(const char*nulstr, const char *needle) { return false; } -bool plymouth_running(void) { - return access("/run/plymouth/pid", F_OK) >= 0; -} - char* strshorten(char *s, size_t l) { assert(s); diff --git a/src/shared/util.h b/src/shared/util.h index d229e1e68..749bd0ea8 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -549,8 +549,6 @@ int kill_and_sigcont(pid_t pid, int sig); bool nulstr_contains(const char*nulstr, const char *needle); -bool plymouth_running(void); - bool hostname_is_valid(const char *s) _pure_; char* hostname_cleanup(char *s, bool lowercase); |