fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-05-07 20:08:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

main: load default splash settings at start up

Browse source 
There's no reason to load them lazily, and when
we extend the functions to add a theme delay setting,
we're going to want to have the settings available as early as
possible.
This commit is contained in:
Ray Strode 2014-01-10 13:26:16 -05:00
parent 9ef8c46036
commit 19fe37f9d3
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main.c
View file

@ -406,14 +406,12 @@ show_default_splash (state_t *state)
return;
ply_trace ("Showing splash screen");
find_override_splash (state);
if (state->override_splash_path != NULL)
{
ply_trace ("Trying override splash at '%s'", state->override_splash_path);
state->boot_splash = show_theme (state, state->override_splash_path);
}
find_system_default_splash (state);
if (state->boot_splash == NULL &&
state->system_default_splash_path != NULL)
{
@ -421,7 +419,6 @@ show_default_splash (state_t *state)
state->boot_splash = show_theme (state, state->system_default_splash_path);
}
find_distribution_default_splash (state);
if (state->boot_splash == NULL &&
state->distribution_default_splash_path != NULL)
{
@ -2227,6 +2224,10 @@ main (int argc,
return EX_UNAVAILABLE;
}
find_override_splash (&state);
find_system_default_splash (&state);
find_distribution_default_splash (&state);
if (command_line_has_argument (state.kernel_command_line, "plymouth.ignore-serial-consoles"))
device_manager_flags |= PLY_DEVICE_MANAGER_FLAGS_IGNORE_SERIAL_CONSOLES;