diff options
author | Ray Strode <rstrode@redhat.com> | 2008-07-11 08:43:46 -0400 |
---|---|---|
committer | Ray Strode <rstrode@redhat.com> | 2008-07-11 08:43:46 -0400 |
commit | a68a8b736ac9d6c2c813d0c53b5ef0d3736042bb (patch) | |
tree | 099a8244f51be70a62cd9ebac6ae24bac7d6b2e7 | |
parent | d8086a93a37e1e76c7b544a13faef13683c79b62 (diff) | |
download | plymouth-a68a8b736ac9d6c2c813d0c53b5ef0d3736042bb.tar.gz plymouth-a68a8b736ac9d6c2c813d0c53b5ef0d3736042bb.tar.xz plymouth-a68a8b736ac9d6c2c813d0c53b5ef0d3736042bb.zip |
Use details plugin instead of bailing if no rhgb on kernel cmdline
We still want things like ask-for-password and logging to work.
-rw-r--r-- | src/main.c | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -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; |