summaryrefslogtreecommitdiff
path: root/recipes-lxde
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2017-01-10 18:36:36 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-01-11 21:05:02 +0100
commit2c2966e4ef2b80e0e1e94c45b90d609488b2ccc2 (patch)
tree5c5e10eb798d8f7d75b1004cac810e0871f81897 /recipes-lxde
parent782b36797b03e8a0a044d775f641bdc6b132358e (diff)
lxdm bbappend: kill lxsession explicetely with sigkill on poweroff
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
Diffstat (limited to 'recipes-lxde')
-rw-r--r--recipes-lxde/lxdm/lxdm/0001-lxdm.service-kill-lxsession-explicitely-with-sigkill.patch39
-rw-r--r--recipes-lxde/lxdm/lxdm_%.bbappend1
2 files changed, 40 insertions, 0 deletions
diff --git a/recipes-lxde/lxdm/lxdm/0001-lxdm.service-kill-lxsession-explicitely-with-sigkill.patch b/recipes-lxde/lxdm/lxdm/0001-lxdm.service-kill-lxsession-explicitely-with-sigkill.patch
new file mode 100644
index 0000000..a0c7f21
--- /dev/null
+++ b/recipes-lxde/lxdm/lxdm/0001-lxdm.service-kill-lxsession-explicitely-with-sigkill.patch
@@ -0,0 +1,39 @@
+From 597507f6a6a05140d01db9fa16351ac158674960 Mon Sep 17 00:00:00 2001
+From: Max Krummenacher <max.krummenacher@toradex.com>
+Date: Tue, 10 Jan 2017 18:15:18 +0100
+Subject: [PATCH] lxdm.service: kill lxsession explicitely with sigkill
+
+When shuting down on a Colibri iMX6 we often see that the shutdown gets
+delayed with:
+
+[ OK ] Removed slice system-serial\x2dgetty.slice.
+[ **] A stop job is running for Session c1 of user root (8s / 1min 30s)
+
+When one examines this one or several process of lxdm/lxde are still running.
+After the timeout runs out the process(es) get killed with SIGKILL, often
+triggering
+
+[ 77.886935] [drm:drm_legacy_unlock] *ERROR* Process 536 using kernel context 0
+
+Killing lxsession seems to cure the issue.
+
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
+---
+ systemd/lxdm.service | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/systemd/lxdm.service b/systemd/lxdm.service
+index bf4a0a8..a116f9d 100644
+--- a/systemd/lxdm.service
++++ b/systemd/lxdm.service
+@@ -5,6 +5,7 @@ After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
+
+ [Service]
+ ExecStart=/usr/sbin/lxdm
++ExecStop=/usr/bin/killall -9 lxsession
+ Restart=always
+ IgnoreSIGPIPE=no
+
+--
+2.5.5
+
diff --git a/recipes-lxde/lxdm/lxdm_%.bbappend b/recipes-lxde/lxdm/lxdm_%.bbappend
index b424145..eb9906d 100644
--- a/recipes-lxde/lxdm/lxdm_%.bbappend
+++ b/recipes-lxde/lxdm/lxdm_%.bbappend
@@ -3,4 +3,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/lxdm:"
SRC_URI += " \
file://logout-fixes.patch \
file://root-autologin.patch \
+ file://0001-lxdm.service-kill-lxsession-explicitely-with-sigkill.patch \
"