|
Zbigniew Jędrzejewski-Szmek |
ca73a2 |
From 29e00416bbef0e8073373fde25347d139749d949 Mon Sep 17 00:00:00 2001
|
|
Zbigniew Jędrzejewski-Szmek |
ca73a2 |
From: Colin Guthrie <colin@mageia.org>
|
|
Zbigniew Jędrzejewski-Szmek |
ca73a2 |
Date: Mon, 27 Jan 2014 17:54:29 +0000
|
|
Zbigniew Jędrzejewski-Szmek |
ca73a2 |
Subject: [PATCH] Temporary work around for slow shutdown due to unterminated
|
|
Zbigniew Jędrzejewski-Szmek |
ca73a2 |
user sessions.
|
|
Zbigniew Jędrzejewski-Szmek |
ca73a2 |
|
|
Zbigniew Jędrzejewski-Szmek |
ca73a2 |
---
|
|
Zbigniew Jędrzejewski-Szmek |
ca73a2 |
units/user@.service.in | 7 +++++++
|
|
Zbigniew Jędrzejewski-Szmek |
ca73a2 |
1 file changed, 7 insertions(+)
|
|
Zbigniew Jędrzejewski-Szmek |
ca73a2 |
|
|
Zbigniew Jędrzejewski-Szmek |
ca73a2 |
diff --git a/units/user@.service.in b/units/user@.service.in
|
|
Zbigniew Jędrzejewski-Szmek |
ca73a2 |
index 3f8b59d..a7e0584 100644
|
|
Zbigniew Jędrzejewski-Szmek |
ca73a2 |
--- a/units/user@.service.in
|
|
Zbigniew Jędrzejewski-Szmek |
ca73a2 |
+++ b/units/user@.service.in
|
|
Zbigniew Jędrzejewski-Szmek |
ca73a2 |
@@ -14,5 +14,12 @@ User=%I
|
|
Zbigniew Jędrzejewski-Szmek |
ca73a2 |
PAMName=systemd-user
|
|
Zbigniew Jędrzejewski-Szmek |
ca73a2 |
Type=notify
|
|
Zbigniew Jędrzejewski-Szmek |
ca73a2 |
ExecStart=-@rootlibexecdir@/systemd --user
|
|
Zbigniew Jędrzejewski-Szmek |
ca73a2 |
+# Apply same work around as apache's httpd until issues with user session
|
|
Zbigniew Jędrzejewski-Szmek |
ca73a2 |
+# killing is fixed (currently problem is that the kill issued by systemd --user
|
|
Zbigniew Jędrzejewski-Szmek |
ca73a2 |
+# is itself killed by systemd (PID1) before it can work which can lead to slow
|
|
Zbigniew Jędrzejewski-Szmek |
ca73a2 |
+# shutdowns
|
|
Zbigniew Jędrzejewski-Szmek |
ca73a2 |
+# http://thread.gmane.org/gmane.comp.sysutils.systemd.devel/16363
|
|
Zbigniew Jędrzejewski-Szmek |
ca73a2 |
+ExecStop=/bin/kill -TERM ${MAINPID}
|
|
Zbigniew Jędrzejewski-Szmek |
ca73a2 |
+KillSignal=SIGCONT
|
|
Zbigniew Jędrzejewski-Szmek |
ca73a2 |
Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/dbus/user_bus_socket
|
|
Zbigniew Jędrzejewski-Szmek |
ca73a2 |
Slice=user-%i.slice
|