daandemeyer / rpms / systemd

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