From: Ray Strode <rstrode@redhat.com>
Date: Fri, 11 Jul 2008 12:43:46 +0000 (-0400)
Subject: Use details plugin instead of bailing if no rhgb on kernel cmdline
X-Git-Tag: 0.6.0~241
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a68a8b736ac9d6c2c813d0c53b5ef0d3736042bb;p=thirdparty%2Fplymouth.git

Use details plugin instead of bailing if no rhgb on kernel cmdline

We still want things like ask-for-password and logging to work.
---

diff --git a/src/main.c b/src/main.c
index 93363e2b..f55d5863 100644
--- a/src/main.c
+++ b/src/main.c
@@ -65,6 +65,8 @@ static ply_boot_splash_t *start_boot_splash (state_t    *state,
 
 static ply_window_t *create_window (state_t *state, int vt_number);
 
+static bool plymouth_should_show_default_splash (state_t *state);
+
 static void
 on_session_output (state_t    *state,
                    const char *output,
@@ -169,7 +171,10 @@ on_show_splash (state_t *state)
       ply_window_take_console (state->window);
     }
 
-  show_default_splash (state);
+  if (plymouth_should_show_default_splash (state))
+    show_default_splash (state);
+  else
+    show_detailed_splash (state);
 }
 
 static void
@@ -416,7 +421,7 @@ set_console_io_to_vt1 (state_t *state)
 }
 
 static bool
-plymouth_should_be_running (state_t *state)
+plymouth_should_show_default_splash (state_t *state)
 {
   ply_trace ("checking if plymouth should be running");
 
@@ -457,9 +462,6 @@ initialize_environment (state_t *state)
 
   check_verbosity (state);
 
-  if (!plymouth_should_be_running (state))
-    return false;
-
   if (!set_console_io_to_vt1 (state))
     return false;