From: Ray Strode <rstrode@redhat.com>
Date: Wed, 26 May 2010 17:10:46 +0000 (-0400)
Subject: [main] Be more forgiving of an absent boot splash
X-Git-Tag: 0.8.4~202
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9aa8907f343840384cd7cb3f4a7b1c75cbbaf4f;p=thirdparty%2Fplymouth.git

[main] Be more forgiving of an absent boot splash

Mandriva has cases where they need to drop to details mode
before /usr is mounted.  /usr has the details splash plugin,
so this causes plymouth to explicitly exit.

This commit makes plymouth cope with that scenario slightly
better.  It takes out the exit(1) call which was clearly bogus,
and also makes parts of the code handle a NULL splash better.
This is not a real fix though.

Ultimately, we should make "details" be built-in as a nice failsafe.
There's no reason we should need to load it off the disk as a plugin.
---

diff --git a/src/main.c b/src/main.c
index e622755f..cbb65413 100644
--- a/src/main.c
+++ b/src/main.c
@@ -175,6 +175,12 @@ on_update (state_t     *state,
 static void
 show_messages (state_t *state)
 {
+  if (state->boot_splash == NULL)
+    {
+      ply_trace ("not displaying messages, since no boot splash");
+      return;
+    }
+
   ply_list_node_t *node = ply_list_get_first_node (state->messages);
   while (node != NULL)
     {
@@ -201,8 +207,7 @@ show_detailed_splash (state_t *state)
 
   if (state->boot_splash == NULL)
     {
-      ply_trace ("Could not start detailed splash screen, exiting");
-      exit (1);
+      ply_trace ("Could not start detailed splash screen, this could be a problem.");
     }
 }