[ daemon ] handle plymouth:force-splash on kernel cmdline

When booting with init=..., plymouthd disables itself. It is problematic
when using bootchartd (bug #22180). plymouth:force-splash allows to
force plymouthd splash.

Ensure init= value is not used when starting plymouthd for shutdown.

diff --git a/src/main.c b/src/main.c
index c309fab253743cbc6d4302b31471d88d727f5df2..66c0f5151172ad44a860ee8dffe2b0e130e8d45f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -474,6 +474,9 @@ static bool
 plymouth_should_ignore_show_splash_calls (state_t *state)
 {
   ply_trace ("checking if plymouth should be running");
+  if (state->mode != PLY_MODE_BOOT || ply_string_has_prefix (state->kernel_command_line, "plymouth:force-splash") || strstr (state->kernel_command_line, " plymouth:force-splash") != NULL)
+      return false;
+
   return ply_string_has_prefix (state->kernel_command_line, "init=") || strstr (state->kernel_command_line, " init=") != NULL;
 }