From: João Paulo Rechi Vita Date: Fri, 7 Apr 2017 14:01:17 +0000 (-0400) Subject: main: Look for config in runtime dir first X-Git-Tag: 0.9.3~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11b0ce04dea52fe5d049d25b66508c6ebfc45775;p=thirdparty%2Fplymouth.git main: Look for config in runtime dir first 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 --- diff --git a/src/main.c b/src/main.c index 50d19210..eeb4e20d 100644 --- a/src/main.c +++ b/src/main.c @@ -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);