summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenry Gebhardt <hsggebhardt@googlemail.com>2012-08-21 17:36:42 -0400
committerHenry Gebhardt <hsggebhardt@googlemail.com>2012-08-21 17:36:42 -0400
commite21837da4c6e5eb6f4d4f61f1b1579c8a371177a (patch)
tree29c94275f1457bdfa475a22347e9915dfcdfded6 /sys-apps/systemd-units/files/services-desktop
parentsys-apps/systemd-units: remove policykit-daemon.service (diff)
downloadsystemd-e21837da4c6e5eb6f4d4f61f1b1579c8a371177a.tar.gz
systemd-e21837da4c6e5eb6f4d4f61f1b1579c8a371177a.tar.bz2
systemd-e21837da4c6e5eb6f4d4f61f1b1579c8a371177a.zip
systemd-units: Change kdm@.service -> kdm.service
See http://astaecker.blogspot.de/2012/08/systemd-187-and-display-managers.html and https://bugs.gentoo.org/show_bug.cgi?id=432066
Diffstat (limited to 'sys-apps/systemd-units/files/services-desktop')
-rw-r--r--sys-apps/systemd-units/files/services-desktop/kdm.service12
-rw-r--r--sys-apps/systemd-units/files/services-desktop/kdm_at.service11
2 files changed, 12 insertions, 11 deletions
diff --git a/sys-apps/systemd-units/files/services-desktop/kdm.service b/sys-apps/systemd-units/files/services-desktop/kdm.service
new file mode 100644
index 0000000..412ffa3
--- /dev/null
+++ b/sys-apps/systemd-units/files/services-desktop/kdm.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=KDM Display Manager
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
+
+[Service]
+ExecStart=/usr/bin/kdm -nodaemon
+Restart=always
+IgnoreSIGPIPE=no
+
+[Install]
+Alias=display-manager.service
diff --git a/sys-apps/systemd-units/files/services-desktop/kdm_at.service b/sys-apps/systemd-units/files/services-desktop/kdm_at.service
deleted file mode 100644
index 024b0c0..0000000
--- a/sys-apps/systemd-units/files/services-desktop/kdm_at.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=KDE Display Manager on %I
-Requires=dev-%i.device
-After=dev-%i.device systemd-user-sessions.service
-
-[Service]
-ExecStart=/usr/bin/kdm -nodaemon %I
-ExecStop=/usr/bin/kdmctl suicide
-
-[Install]
-Alias=graphical.target.wants/kdm@tty7.service