diff options
| author | Ondrej Kozina <okozina@redhat.com> | 2015-05-12 09:37:19 +0200 |
|---|---|---|
| committer | Ondrej Kozina <okozina@redhat.com> | 2015-05-12 17:16:24 +0200 |
| commit | cdb7ce6f17e01821268c38ec10fed65f0400cc55 (patch) | |
| tree | b372717428ba0567a48df9813833b7e1d13c7b64 | |
| parent | 100daa7fd882ee4ba8626930283340ed05219470 (diff) | |
| download | lvm2-cdb7ce6f17e01821268c38ec10fed65f0400cc55.tar.gz | |
libdaemon: shutdown on idle also in non-systemd environment
| -rw-r--r-- | WHATS_NEW | 1 | ||||
| -rw-r--r-- | libdaemon/server/daemon-server.c | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -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 1869956fe..5b1aff1c5 100644 --- 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) |