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

main: Look for config in runtime dir first

Browse source 
This makes possible to support shipping a self-contained initrd which
completely overrides the plymouth theme. The configuration and theme are
copied to /run by a custom service before plymouth starts, so plymouth
can load the correct config from /run both during bootup and shutdown.

This commit changes the routine which resolves plymouth.defaults' path,
to have it look first in plymouth's runtime directory.

Signed-off-by: João Paulo Rechi Vita <jprvita@endlessm.com>
This commit is contained in:
João Paulo Rechi Vita 2017-04-07 10:01:17 -04:00 • committed by Ray Strode
parent 6535986079
commit 11b0ce04de
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main.c
View file

@ -488,9 +488,12 @@ find_distribution_default_splash (state_t *state)
if (state->distribution_default_splash_path != NULL)
return;
if (!load_settings (state, PLYMOUTH_POLICY_DIR "plymouthd.defaults", &state->distribution_default_splash_path)) {
ply_trace ("failed to load " PLYMOUTH_POLICY_DIR "plymouthd.defaults");
return;
if (!load_settings (state, PLYMOUTH_RUNTIME_DIR "/plymouthd.defaults", &state->distribution_default_splash_path)) {
ply_trace ("failed to load " PLYMOUTH_RUNTIME_DIR "/plymouthd.defaults, trying " PLYMOUTH_POLICY_DIR);
if (!load_settings (state, PLYMOUTH_POLICY_DIR "plymouthd.defaults", &state->distribution_default_splash_path)) {
ply_trace ("failed to load " PLYMOUTH_POLICY_DIR "plymouthd.defaults");
return;
}
}
ply_trace ("Distribution default theme file is '%s'", state->distribution_default_splash_path);