MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2025-12-14 14:25:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

lxdm: remove conflicts setting

Browse Source 
When use plymouth[1] with lxdm, the plymouth boot splash screen
will hang there as lxdm.service conflicts with plymouth-quit.service
and plymouth-quit will fail to start if plymouth-quit.service and
lxdm.service start at the same time and it will result in the boot
screen hang forever.

Consider there is also After setting for these two services, so
remove the conflicts setting to make the service start as expected.

[1] https://gitlab.freedesktop.org/plymouth/plymouth/-/tree/main

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Mingli Yu 2022-01-25 10:59:48 +08:00 committed by Khem Raj
parent d82d175a80
commit fbfb73d201
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
meta-oe/recipes-graphics/lxdm/lxdm/0001-systemd-lxdm.service-remove-plymouth-quit-conflicts.patch Normal file
View File

@ -0,0 +1,38 @@
From f662906c52f264e4c139e402932103f47269aa1b Mon Sep 17 00:00:00 2001
From: Mingli Yu <mingli.yu@windriver.com>
Date: Mon, 24 Jan 2022 17:16:15 +0800
Subject: [PATCH] systemd/lxdm.service: remove plymouth-quit conflicts
When use plymouth[1] with lxdm, the plymouth boot splash screen
will hang there as lxdm.service conflicts with plymouth-quit.service
and plymouth-quit will fail to start if plymouth-quit.service and
lxdm.service start at the same time and it will result in the boot
screen hang forever.
Consider there is also After setting for these two services, so
remove the conflicts setting to make the service start as expected.
[1] https://gitlab.freedesktop.org/plymouth/plymouth/-/tree/main
Upstream-Status: Submitted [https://sourceforge.net/p/lxdm/code/merge-requests/3]
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
systemd/lxdm.service | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/systemd/lxdm.service b/systemd/lxdm.service
index bf4a0a8..90d8cdb 100644
--- a/systemd/lxdm.service
+++ b/systemd/lxdm.service
@@ -1,6 +1,6 @@
[Unit]
Description=LXDE Display Manager
-Conflicts=getty@tty1.service plymouth-quit.service
+Conflicts=getty@tty1.service
After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
[Service]
--
2.17.1

1
meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb
View File

@ -18,6 +18,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}%20${PV}/${BPN}-${PV}.tar.
file://0007-greeter.c-support-to-update-expired-password.patch \
file://0008-greeter.c-show-information-on-gtk-label-info.patch \
file://0009-greeter.c-disallow-empty-new-password.patch \
file://0001-systemd-lxdm.service-remove-plymouth-quit-conflicts.patch \
"
SRC_URI[md5sum] = "061caae432634e6db38bbdc84bc6ffa0"
SRC_URI[sha256sum] = "4891efee81c72a400cc6703e40aa76f3f3853833d048b72ec805da0f93567f2f"