summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@profusion.mobi>2010-11-24 23:17:53 -0200
committerLennart Poettering <lennart@poettering.net>2010-11-25 00:30:16 +0100
commitd2ffe6deac67d83ea1c707812967a22e185bdc0a (patch)
tree787f1753fdce5a2ca6f3637e3724cd4b7935363d
parent9b8a535f4d54708a1172199cffcf62ad7d490235 (diff)
units: Remove Gentoo specific xdm.servicesystemd/v14
That unity pulls in OpenRC which in turn pulls in most of legacy system that causes lots of troubles as it is too smart, thus not recommended. Moreover, SystemD developers seems to agree that a service file per DM is the best approach, so having gdm.service, kdm.service, slim.service is better than a single wrapper for them.
-rw-r--r--Makefile.am12
l---------units/gentoo/Makefile1
-rw-r--r--units/gentoo/xdm.service17
3 files changed, 0 insertions, 30 deletions
diff --git a/Makefile.am b/Makefile.am
index d7a279c152..471954bf68 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -334,10 +334,6 @@ dist_systemunit_DATA += \
units/fedora/plymouth-halt.service
endif
-if TARGET_GENTOO
-dist_systemunit_DATA += \
- units/gentoo/xdm.service
-endif
if TARGET_ARCH
dist_systemunit_DATA += \
@@ -1309,14 +1305,6 @@ if TARGET_FEDORA
rm -f display-manager.service && \
$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
endif
-if TARGET_GENTOO
- ( cd $(DESTDIR)$(systemunitdir) && \
- rm -f display-manager.service && \
- $(LN_S) xdm.service display-manager.service )
- ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
- rm -f display-manager.service && \
- $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
-endif
if TARGET_DEBIAN_OR_UBUNTU
( cd $(DESTDIR)$(systemunitdir) && \
rm -f runlevel5.target && \
diff --git a/units/gentoo/Makefile b/units/gentoo/Makefile
deleted file mode 120000
index 50be21181f..0000000000
--- a/units/gentoo/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../../src/Makefile \ No newline at end of file
diff --git a/units/gentoo/xdm.service b/units/gentoo/xdm.service
deleted file mode 100644
index b94c6a8c0a..0000000000
--- a/units/gentoo/xdm.service
+++ /dev/null
@@ -1,17 +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 General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-[Unit]
-Description=Display Manager
-After=syslog.target dbus.target hald.service
-
-[Service]
-ExecStart=/etc/init.d/xdm start
-
-[Install]
-Alias=display-manager.service
-WantedBy=graphical.target