|
 |
ced1f5 |
From 7f4a89ff4e7dc7c3ffac24ac87187dca1e9e7d1e Mon Sep 17 00:00:00 2001
|
|
|
ced1f5 |
From: Lukas Slebodnik <lslebodn@redhat.com>
|
|
|
ced1f5 |
Date: Wed, 8 Nov 2017 14:09:36 +0100
|
|
|
ced1f5 |
Subject: [PATCH 33/35] SYSTEMD: Clean pid file in corner cases
|
|
|
ced1f5 |
MIME-Version: 1.0
|
|
|
ced1f5 |
Content-Type: text/plain; charset=UTF-8
|
|
|
ced1f5 |
Content-Transfer-Encoding: 8bit
|
|
|
ced1f5 |
|
|
|
ced1f5 |
SSSD can cleanup pid file in case of standard stopping of daemon.
|
|
|
ced1f5 |
It's done in function monitor_cleanup. However monitor does not have a
|
|
|
ced1f5 |
change to cleanup file in case of OOM or sending SIGKILL to monitor.
|
|
|
ced1f5 |
|
|
|
ced1f5 |
Even though PIDFile is not necessary for services with Type notify
|
|
|
ced1f5 |
we should let systemd to clean this file in unexpected situations.
|
|
|
ced1f5 |
|
|
|
ced1f5 |
Resolves:
|
|
|
ced1f5 |
https://pagure.io/SSSD/sssd/issue/3528
|
|
|
ced1f5 |
|
|
|
ced1f5 |
Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
|
|
|
ced1f5 |
(cherry picked from commit f4b808c83ecbaf36c7069440535d62990e32d55d)
|
|
|
ced1f5 |
---
|
|
|
ced1f5 |
src/sysv/systemd/sssd.service.in | 1 +
|
|
|
ced1f5 |
1 file changed, 1 insertion(+)
|
|
|
ced1f5 |
|
|
|
ced1f5 |
diff --git a/src/sysv/systemd/sssd.service.in b/src/sysv/systemd/sssd.service.in
|
|
|
ced1f5 |
index cea848fac80303d6fae12dd84316a91dbc60072d..0c515d34caaa3ea397c4c7e95eef0188df170840 100644
|
|
|
ced1f5 |
--- a/src/sysv/systemd/sssd.service.in
|
|
|
ced1f5 |
+++ b/src/sysv/systemd/sssd.service.in
|
|
|
ced1f5 |
@@ -10,6 +10,7 @@ EnvironmentFile=-@environment_file@
|
|
|
ced1f5 |
ExecStart=@sbindir@/sssd -i ${DEBUG_LOGGER}
|
|
|
ced1f5 |
Type=notify
|
|
|
ced1f5 |
NotifyAccess=main
|
|
|
ced1f5 |
+PIDFile=@localstatedir@/run/sssd.pid
|
|
|
ced1f5 |
|
|
|
ced1f5 |
[Install]
|
|
|
ced1f5 |
WantedBy=multi-user.target
|
|
|
ced1f5 |
--
|
|
|
ced1f5 |
2.13.6
|
|
|
ced1f5 |
|