From d2ffe6deac67d83ea1c707812967a22e185bdc0a Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Wed, 24 Nov 2010 23:17:53 -0200 Subject: units: Remove Gentoo specific xdm.service 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. --- Makefile.am | 12 ------------ units/gentoo/Makefile | 1 - units/gentoo/xdm.service | 17 ----------------- 3 files changed, 30 deletions(-) delete mode 120000 units/gentoo/Makefile delete mode 100644 units/gentoo/xdm.service 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 -- cgit v1.2.3-54-g00ecf