chiark / gitweb /
units: Remove Gentoo specific xdm.service v14
authorGustavo Sverzut Barbieri <barbieri@profusion.mobi>
Thu, 25 Nov 2010 01:17:53 +0000 (23:17 -0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 24 Nov 2010 23:30:16 +0000 (00:30 +0100)
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
units/gentoo/Makefile [deleted symlink]
units/gentoo/xdm.service [deleted file]

index d7a279c152297ce7586961d5a5026ec3d602e8a2..471954bf684ffcfc4950a9a7f918e42db2b850b1 100644 (file)
@@ -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 (symlink)
index 50be211..0000000
+++ /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 (file)
index b94c6a8..0000000
+++ /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