daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
1ff636
From b0204b37bd8275f95885548277acf5bda383173d Mon Sep 17 00:00:00 2001
1ff636
From: Lennart Poettering <lennart@poettering.net>
1ff636
Date: Fri, 24 Apr 2015 16:12:28 +0200
1ff636
Subject: [PATCH] units: set KillMode=mixed for our daemons that fork worker
1ff636
 processes
1ff636
1ff636
The daemons should really have the time to kill the workers first,
1ff636
before systemd does it, hence use KillMode=mixed for these daemons.
1ff636
1ff636
https://bugs.freedesktop.org/show_bug.cgi?id=90051
1ff636
(cherry picked from commit 658f26b828fdd7007cfe82d794f610525b21cb99)
1ff636
1ff636
Cherry-picked from: 7396ceb
1ff636
Resolves: #1222517
1ff636
---
1ff636
 units/systemd-importd.service.in | 1 +
1ff636
 units/systemd-udevd.service.in   | 1 +
1ff636
 2 files changed, 2 insertions(+)
1ff636
1ff636
diff --git a/units/systemd-importd.service.in b/units/systemd-importd.service.in
c62b8e
index 26759ea0fb..5534a49ede 100644
1ff636
--- a/units/systemd-importd.service.in
1ff636
+++ b/units/systemd-importd.service.in
1ff636
@@ -18,3 +18,4 @@ WatchdogSec=1min
1ff636
 PrivateTmp=yes
1ff636
 ProtectSystem=full
1ff636
 ProtectHome=yes
1ff636
+KillMode=mixed
1ff636
diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in
c62b8e
index a133044005..32f04d901a 100644
1ff636
--- a/units/systemd-udevd.service.in
1ff636
+++ b/units/systemd-udevd.service.in
1ff636
@@ -22,3 +22,4 @@ Restart=always
1ff636
 RestartSec=0
1ff636
 ExecStart=@rootlibexecdir@/systemd-udevd
1ff636
 MountFlags=slave
1ff636
+KillMode=mixed