SHA256
1
0
forked from pool/xdm

Accepting request 829786 from home:fbui:branches:X11:XOrg

- Replace /var/run with /run as /var/run is obsolete since quite some
  time now.

OBS-URL: https://build.opensuse.org/request/show/829786
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=204
This commit is contained in:
Stefan Dirsch 2020-08-26 14:55:51 +00:00 committed by Git OBS Bridge
parent 5666ece412
commit 0167ae6af7
4 changed files with 11 additions and 6 deletions

View File

@ -1,6 +1,5 @@
[Unit]
Description=X Display Manager
Requires=var-run.mount
Conflicts=getty@tty7.service plymouth-quit.service
After=ypbind.service gpm.service time-sync.target winbind.service acpid.service
Wants=remote-fs.target dbus.socket systemd-user-sessions.service systemd-logind.service
@ -9,7 +8,7 @@ OnFailure=plymouth-quit.service
[Service]
Type=forking
PIDFile=/var/run/displaymanager.pid
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

View File

@ -30,10 +30,10 @@
for i in $DISPLAY_MANAGERS
do
name="${i}_vars"
- PIDFILE=/var/run/$i.pid;
- PIDFILE=/run/$i.pid;
- $name $DM && break;
+ type -t $name &> /dev/null || continue
+ PIDFILE=/var/run/$i.pid
+ PIDFILE=/run/$i.pid
+ $name $DM && break
done
if [ -z "$DISPLAYMANAGER" -o ! -x "$DISPLAYMANAGER" ]

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Aug 26 13:39:08 UTC 2020 - Franck Bui <fbui@suse.com>
- Replace /var/run with /run as /var/run is obsolete since quite some
time now.
-------------------------------------------------------------------
Thu Jul 16 05:13:42 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f73e6057c2caf02e52fa3757d2ac58efc36e59cafe11d465c8f135f3b811a6cd
size 24172
oid sha256:fc43409707d85fcf3a40db1f3ee4530fb06833a1cbdb14107eb7abcc8925fc35
size 23816