mirror of
https://github.com/systemd/systemd.git
synced 2024-12-23 21:35:11 +03:00
units: remove prefdm
It's time to get rid of prefdm. Distributions which still want to use this should maintain this downstream, but it's probably better to just provide proper units for the various display managers, like Fedora is doing this, for example: https://fedoraproject.org/wiki/Features/DisplayManagerRework
This commit is contained in:
parent
773ba90946
commit
b2c9cbafb8
10
Makefile.am
10
Makefile.am
@ -386,7 +386,6 @@ EXTRA_DIST += \
|
||||
|
||||
if TARGET_FEDORA
|
||||
dist_systemunit_DATA += \
|
||||
units/fedora/prefdm.service \
|
||||
units/fedora/rc-local.service \
|
||||
units/fedora/halt-local.service
|
||||
systemgenerator_PROGRAMS += \
|
||||
@ -395,7 +394,6 @@ endif
|
||||
|
||||
if TARGET_MANDRIVA
|
||||
dist_systemunit_DATA += \
|
||||
units/mandriva/prefdm.service \
|
||||
units/fedora/rc-local.service \
|
||||
units/fedora/halt-local.service
|
||||
systemgenerator_PROGRAMS += \
|
||||
@ -417,7 +415,6 @@ endif
|
||||
|
||||
if TARGET_MAGEIA
|
||||
dist_systemunit_DATA += \
|
||||
units/mageia/prefdm.service \
|
||||
units/fedora/rc-local.service \
|
||||
units/fedora/halt-local.service
|
||||
systemgenerator_PROGRAMS += \
|
||||
@ -3593,15 +3590,12 @@ systemd-install-data-hook:
|
||||
if TARGET_FEDORA
|
||||
( cd $(DESTDIR)$(systemunitdir) && \
|
||||
rm -f display-manager.service single.service && \
|
||||
$(LN_S) prefdm.service display-manager.service && \
|
||||
$(LN_S) rescue.service single.service )
|
||||
endif
|
||||
|
||||
if TARGET_MANDRIVA
|
||||
( cd $(DESTDIR)$(systemunitdir) && \
|
||||
rm -f display-manager.service dm.service single.service && \
|
||||
$(LN_S) prefdm.service display-manager.service && \
|
||||
$(LN_S) prefdm.service dm.service && \
|
||||
$(LN_S) rescue.service single.service )
|
||||
endif
|
||||
|
||||
@ -3619,9 +3613,7 @@ endif
|
||||
|
||||
if TARGET_MAGEIA
|
||||
( cd $(DESTDIR)$(systemunitdir) && \
|
||||
rm -f display-manager.service && \
|
||||
$(LN_S) prefdm.service display-manager.service && \
|
||||
$(LN_S) prefdm.service dm.service )
|
||||
rm -f display-manager.service )
|
||||
endif
|
||||
|
||||
install-exec-hook: $(INSTALL_EXEC_HOOKS)
|
||||
|
@ -1,21 +0,0 @@
|
||||
# This file is part of systemd.
|
||||
#
|
||||
# systemd is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU Lesser General Public License as published by
|
||||
# the Free Software Foundation; either version 2.1 of the License, or
|
||||
# (at your option) any later version.
|
||||
|
||||
[Unit]
|
||||
Description=Display Manager
|
||||
After=livesys-late.service rc-local.service systemd-user-sessions.service
|
||||
|
||||
# On Fedora gdm/X11 is on tty1. We explicitly cancel the getty here to
|
||||
# avoid any races around that.
|
||||
Conflicts=getty@tty1.service plymouth-quit.service
|
||||
After=getty@tty1.service plymouth-quit.service
|
||||
|
||||
[Service]
|
||||
ExecStart=/etc/X11/prefdm -nodaemon
|
||||
Restart=always
|
||||
RestartSec=0
|
||||
IgnoreSIGPIPE=no
|
@ -1,22 +0,0 @@
|
||||
# This file is part of systemd.
|
||||
#
|
||||
# systemd is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU Lesser General Public License as published by
|
||||
# the Free Software Foundation; either version 2.1 of the License, or
|
||||
# (at your option) any later version.
|
||||
|
||||
[Unit]
|
||||
Description=Display Manager
|
||||
After=livesys-late.service systemd-user-sessions.service
|
||||
|
||||
# On Mageia gdm/X11 is on tty1. We explicitly cancel the getty here to
|
||||
# avoid any races around that.
|
||||
# Do not stop plymouth, it is done in prefdm if required (or left to the dm)
|
||||
Conflicts=getty@tty1.service plymouth-quit.service
|
||||
After=getty@tty1.service plymouth-quit.service
|
||||
|
||||
[Service]
|
||||
ExecStart=/etc/X11/prefdm -nodaemon
|
||||
Restart=always
|
||||
RestartSec=0
|
||||
IgnoreSIGPIPE=no
|
@ -1,21 +0,0 @@
|
||||
# This file is part of systemd.
|
||||
#
|
||||
# systemd is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU Lesser General Public License as published by
|
||||
# the Free Software Foundation; either version 2.1 of the License, or
|
||||
# (at your option) any later version.
|
||||
|
||||
[Unit]
|
||||
Description=Display Manager
|
||||
After=livesys-late.service rc-local.service systemd-user-sessions.service
|
||||
After=network.target acpid.service fs.service haldaemon.service
|
||||
|
||||
# Do not stop plymouth, it is done in prefdm if required
|
||||
Conflicts=plymouth-quit.service
|
||||
After=plymouth-quit.service
|
||||
|
||||
[Service]
|
||||
ExecStart=/etc/X11/prefdm
|
||||
Type=forking
|
||||
Restart=always
|
||||
RestartSec=0
|
Loading…
Reference in New Issue
Block a user