summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-03-30 02:21:48 +0200
committerLennart Poettering <lennart@poettering.net>2011-03-30 02:21:48 +0200
commit6faa11140bf776cdaeb8d22d01816e6e48296971 (patch)
treecb3857a75f2f40727d026aecfa00883505758f61 /src/main.c
parent871c44a747a8bf4465cbfda445216e9ac66d4a40 (diff)
status: show status messages unconditionally if plymouth is around
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/main.c b/src/main.c
index 176a4f5ecb..b43d8eca91 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1093,11 +1093,6 @@ int main(int argc, char *argv[]) {
goto finish;
}
- /* If Plymouth is being run make sure we show the status, so
- * that there's something nice to see when people press Esc */
- if (access("/run/initramfs/plymouth", F_OK) >= 0)
- arg_show_status = true;
-
if (arg_action == ACTION_HELP) {
retval = help();
goto finish;
@@ -1177,7 +1172,7 @@ int main(int argc, char *argv[]) {
if (arg_running_as == MANAGER_SYSTEM && !serialization) {
locale_setup();
- if (arg_show_status)
+ if (arg_show_status || plymouth_running())
status_welcome();
kmod_setup();