diff options
| author | Peter Rajnoha <prajnoha@redhat.com> | 2012-03-08 14:54:05 +0000 |
|---|---|---|
| committer | Peter Rajnoha <prajnoha@redhat.com> | 2012-03-08 14:54:05 +0000 |
| commit | 32b7eb9b6b34d5f124ecbe50611be0fe1d094b41 (patch) | |
| tree | 86b6a1de547a0f4ec02fa0cecbd1ce7f64542af9 /libdaemon/server/daemon-server.c | |
| parent | aeb7a93796e764452830688b89c98b1bb9a2a591 (diff) | |
| download | lvm2-32b7eb9b6b34d5f124ecbe50611be0fe1d094b41.tar.gz lvm2-32b7eb9b6b34d5f124ecbe50611be0fe1d094b41.tar.xz lvm2-32b7eb9b6b34d5f124ecbe50611be0fe1d094b41.zip | |
Do not unlink the socket on daemon shutdown if activation is done via systemd.
Diffstat (limited to 'libdaemon/server/daemon-server.c')
| -rw-r--r-- | libdaemon/server/daemon-server.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c index c93cde9f..3cdec348 100644 --- a/libdaemon/server/daemon-server.c +++ b/libdaemon/server/daemon-server.c @@ -508,7 +508,8 @@ void daemon_start(daemon_state s) syslog(LOG_ERR, "Failed to handle a client connection."); } - if (s.socket_fd >= 0) + /* If activated by systemd, do not unlink the socket - systemd takes care of that! */ + if (!_systemd_activation && s.socket_fd >= 0) if (unlink(s.socket_path)) perror("unlink error"); |