From fb63182d072fe57a10e62cf0ffe4065b7a67ac2c Mon Sep 17 00:00:00 2001 From: wangyoukang Date: Sun, 23 Apr 2023 14:58:19 +0800 Subject: [PATCH] fix gdm.service may kill user service during startup Signed-off-by: wangyoukang (cherry picked from commit 85a9ebb91c13bc02ff1c270e2f3a184982db3a48) --- gdm-should-recover-automatically.patch | 24 ------------------------ gdm.spec | 8 +++++--- 2 files changed, 5 insertions(+), 27 deletions(-) delete mode 100644 gdm-should-recover-automatically.patch diff --git a/gdm-should-recover-automatically.patch b/gdm-should-recover-automatically.patch deleted file mode 100644 index 974af8b..0000000 --- a/gdm-should-recover-automatically.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 10f8add3b6f75113676812ef52e32823f91afb44 Mon Sep 17 00:00:00 2001 -From: si-gui <245140120@qq.com> -Date: Fri, 18 Dec 2020 15:18:09 +0800 -Subject: [PATCH] gdm should recover automatically - ---- - data/gdm.service.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/data/gdm.service.in b/data/gdm.service.in -index 72201c1..d2892b8 100644 ---- a/data/gdm.service.in -+++ b/data/gdm.service.in -@@ -20,6 +20,7 @@ After=rc-local.service plymouth-start.service systemd-user-sessions.service - OnFailure=plymouth-quit.service - - [Service] -+ExecStartPre=/bin/sh -c "systemctl stop session-c*.scope" - ExecStart=${sbindir}/gdm - KillMode=mixed - Restart=always --- -2.23.0 - diff --git a/gdm.spec b/gdm.spec index a6f236e..0db68ae 100644 --- a/gdm.spec +++ b/gdm.spec @@ -1,7 +1,7 @@ Name: gdm Epoch: 1 Version: 42.0 -Release: 1 +Release: 2 Summary: A graphical display manager License: GPLv2+ URL: https://wiki.gnome.org/Projects/GDM @@ -11,8 +11,7 @@ Source5: default.pa-for-gdm Patch0: 0001-data-add-system-dconf-databases-to-gdm-profile.patch Patch1: 0001-Honor-initial-setup-being-disabled-by-distro-install.patch -Patch2: gdm-should-recover-automatically.patch -Patch3: 9000-add-openeuler-pam-config.patch +Patch2: 9000-add-openeuler-pam-config.patch BuildRequires: pam-devel >= 0:0.99.8.1-11 desktop-file-utils >= 0.2.90 BuildRequires: libtool automake autoconf libattr-devel gettext-devel libdmx-devel @@ -189,6 +188,9 @@ fi %{_libdir}/pkgconfig/*.pc %changelog +* Tue Apr 18 2023 wangyoukang - 1:42.0-2 +- fix gdm.service may kill user service during startup + * Mon Oct 24 2022 yaoxin - 1:42.0-1 - Update to 42.0 -- Gitee