summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2015-03-16 09:34:59 -0700
committerTom Gundersen <teg@jklm.no>2015-03-16 17:47:27 +0100
commit031886edfc6e96ab778c241035a8d00fb0de99d3 (patch)
tree69cce77ebb0d992549ae732f18766a15e8c28d3b /src/core
parentb17de8449c3ce26031d5bb7dec1086b56e51ac9b (diff)
core: Remove explicit Plymouth integration
Even if plymouth is running, it might have not displayed the splash yet, so we'll see a few lines on fbcon when we should have otherwise had nothing. Plymouth integration was added to systemd in commit 6faa11140bf776cdaeb8d22d01816e6e48296971. That same day, Plymouth got systemd integration [0]. As such, the Plymouth integration has always been obsolete, and was probably only for older Plymouth's. But I can't imagine anybody running a Plymouth from 2011 with a systemd from 2015. Remove the Plymouth/systemd integration, and let Plymouth's code tell systemd to print the details. [0] http://cgit.freedesktop.org/plymouth/commit/?id=537c16422cd49f1beeaab1ad39846a00018faec1 Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net> Cc: Daniel Drake <dsd@endlessm.com> Cc: Ray Strode <rstrode@redhat.com>
Diffstat (limited to 'src/core')
-rw-r--r--src/core/main.c2
-rw-r--r--src/core/manager.c4
2 files changed, 2 insertions, 4 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) {