From 8dcee96fb90f1d53e1493365d2f78f6568e6c773394ff66db07bbca13687ddef Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 27 Aug 2020 10:36:41 +0000 Subject: [PATCH] Accepting request 829814 from home:fbui:branches:X11:XOrg - Drop commands in /usr/lib/X11/display-manager that are never used by systemd OBS-URL: https://build.opensuse.org/request/show/829814 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=205 --- display-manager.service | 1 - xdm.changes | 16 ++++++++++++++++ xdm.tar.bz2 | 4 ++-- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/display-manager.service b/display-manager.service index 4701ac3..458d81e 100644 --- a/display-manager.service +++ b/display-manager.service @@ -10,7 +10,6 @@ OnFailure=plymouth-quit.service Type=forking PIDFile=/run/displaymanager.pid ExecStart=/usr/lib/X11/display-manager start -ExecStop=/usr/lib/X11/display-manager stop ExecReload=/usr/lib/X11/display-manager reload KillMode=process diff --git a/xdm.changes b/xdm.changes index 10fa368..78a5c89 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Aug 26 17:23:18 UTC 2020 - Franck Bui + +- Drop commands in /usr/lib/X11/display-manager that are never used by systemd + + Assuming that this script is only called from + display-manager.service unit, some commands of the scripts are + either never used or redundant with systemd functionalities. + + More specifically, there's no need to redefine a "stop" command as + this is one basic command that systemd implements already. + + Also convert "reload" to make use of $MAINPID exported by systemd + which should be slighly more reliable and hence stop relying on + killproc that might be removed in the future. + ------------------------------------------------------------------- Wed Aug 26 13:39:08 UTC 2020 - Franck Bui diff --git a/xdm.tar.bz2 b/xdm.tar.bz2 index e9998b6..7e78e3e 100644 --- a/xdm.tar.bz2 +++ b/xdm.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc43409707d85fcf3a40db1f3ee4530fb06833a1cbdb14107eb7abcc8925fc35 -size 23816 +oid sha256:70a059ea9c1b06f6724c591928d1f3ca25585d2fa2bbbd138d531029d59dea72 +size 23744