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