diff --git a/display-manager.service b/display-manager.service index 04175eb..4701ac3 100644 --- a/display-manager.service +++ b/display-manager.service @@ -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 diff --git a/xdm-with-update-alternative.patch b/xdm-with-update-alternative.patch index 0781dcb..aff5389 100644 --- a/xdm-with-update-alternative.patch +++ b/xdm-with-update-alternative.patch @@ -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" ] diff --git a/xdm.changes b/xdm.changes index 34fc1c3..10fa368 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 26 13:39:08 UTC 2020 - Franck Bui + +- 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 diff --git a/xdm.tar.bz2 b/xdm.tar.bz2 index 7e6441f..e9998b6 100644 --- a/xdm.tar.bz2 +++ b/xdm.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f73e6057c2caf02e52fa3757d2ac58efc36e59cafe11d465c8f135f3b811a6cd -size 24172 +oid sha256:fc43409707d85fcf3a40db1f3ee4530fb06833a1cbdb14107eb7abcc8925fc35 +size 23816