From: Sven Eden <yamakuzure@gmx.net>
Date: Tue, 29 Aug 2017 14:36:34 +0000 (+0200)
Subject: Prep v234.3: Set defaults for the sleep config *after* loading the config file.
X-Git-Tag: chiark/234.4-1+devuan1.1+iwj1~41
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f49259fd34d5c401a177f69287c9eac883ae5c3a;p=elogind.git

Prep v234.3: Set defaults for the sleep config *after* loading the config file.
---

diff --git a/src/login/logind.c b/src/login/logind.c
index b09ecf611..58c91fdfe 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;
 }
 
@@ -1327,6 +1328,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");