From 6e076a5acab532181c345d4c9846115b61699b19 Mon Sep 17 00:00:00 2001 From: Sven Eden Date: Tue, 29 Aug 2017 16:37:03 +0200 Subject: [PATCH] Prep v235: Set defaults for the sleep config *after* loading the config file. --- src/login/logind.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/login/logind.c b/src/login/logind.c index b66f9a3a5..5cc118ae9 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -81,9 +81,6 @@ static void manager_reset_config(Manager *m) { m->kill_only_users = strv_free(m->kill_only_users); m->kill_exclude_users = strv_free(m->kill_exclude_users); -#if 1 /// elogind needs an Add-On for sleep configuration - elogind_manager_reset_config(m); -#endif // 1 } static Manager *manager_new(void) { @@ -1140,6 +1137,10 @@ static int manager_dispatch_reload_signal(sd_event_source *s, const struct signa else log_info("Config file reloaded."); +#if 1 /// elogind needs an Add-On for sleep configuration + elogind_manager_reset_config(m); +#endif // 1 + return 0; } @@ -1346,6 +1347,10 @@ int main(int argc, char *argv[]) { manager_parse_config_file(m); +#if 1 /// elogind needs an Add-On for sleep configuration + elogind_manager_reset_config(m); +#endif // 1 + r = manager_startup(m); if (r < 0) { log_error_errno(r, "Failed to fully start up daemon: %m"); -- 2.30.2