libdaemon: shutdown on idle also in non-systemd environment

diff --git a/WHATS_NEW b/WHATS_NEW
index d724a1b8dd1a3b2011d72ebddc19454817bd7bfa..e1674e21fc4a7a92c01122db9f7ea425ec8d4c23 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.120 -
 ===============================
+  Daemons (libdaemon) support exit on idle also in non-systemd environment.
   Provide make dist and make rpm targets
   Configure lvm.conf for use_lvmetad and use_lvmpolld.
   Add lvpoll for cmdline communication with lvmpolld.

diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c
index 1869956febb33e0204be0dd04f81e5c8b092d73d..5b1aff1c55a8d8baa8b6a64082679cadef68ff84 100644 (file)
--- a/libdaemon/server/daemon-server.c
+++ b/libdaemon/server/daemon-server.c
@@ -82,12 +82,12 @@ static void _exit_handler(int sig __attribute__((unused)))
 
 static int _is_idle(daemon_state s)
 {
-       return _systemd_activation && s.idle && s.idle->is_idle && !s.threads->next;
+       return s.idle && s.idle->is_idle && !s.threads->next;
 }
 
 static struct timeval *_get_timeout(daemon_state s)
 {
-       return (_systemd_activation && s.idle) ? s.idle->ptimeout : NULL;
+       return s.idle ? s.idle->ptimeout : NULL;
 }
 
 static void _reset_timeout(daemon_state s)