summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAuke Kok <auke-jan.h.kok@intel.com>2012-10-14 22:58:29 -0700
committerAuke Kok <auke-jan.h.kok@intel.com>2012-10-14 22:58:29 -0700
commite1a6f6ee6f63d6cb09b9ef69393be9f70452e90f (patch)
tree5292040ac9e24ebbad7e7243341894ab9015484e
parent99ec445f66a5ef652cfc1f67e058a5e52886e310 (diff)
downloadxorg-launch-helper-e1a6f6ee6f63d6cb09b9ef69393be9f70452e90f.tar.gz
xorg-launch-helper-e1a6f6ee6f63d6cb09b9ef69393be9f70452e90f.tar.bz2
xorg-launch-helper-e1a6f6ee6f63d6cb09b9ef69393be9f70452e90f.zip
Change xorg.service to KillMode=process.
Withtout TERM signal, Xorg remains hanging since the normal user isn't permitted to cgroup terminate the group with Xorg still in it (at least that's my assumption). With KillMode=process, xorg-launch-helper properly gets a TERM and delegates it to Xorg, and shutdown proceeds as normal.
-rw-r--r--xorg.service.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/xorg.service.in b/xorg.service.in
index 6ee5ce0..efb5d99 100644
--- a/xorg.service.in
+++ b/xorg.service.in
@@ -17,6 +17,7 @@ Before=xorg.target
[Service]
Type=notify
+KillMode=process
ExecStart=@prefix@/bin/xorg-launch-helper :0 -nolisten tcp -noreset vt1
Restart=always
RestartSec=10