[systemd-commits] Makefile.am units/gentoo

[Lennart Poettering]

 Makefile.am                 |    8 ++++++++
 units/gentoo/reboot.service |    1 -
 units/gentoo/xdm.service    |    3 ++-
 3 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit f306f4c40d7004be058678ff3ed90c9c006767e0
Author: Marc-Antoine Perennou <Marc-Antoine at Perennou.com>
Date:   Thu May 20 23:54:59 2010 +0200

    units: fix Gentoo services

diff --git a/Makefile.am b/Makefile.am
index bd25239..a15777e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -538,6 +538,14 @@ if TARGET_FEDORA
 	( cd $(DESTDIR)/etc/init.d && \
 		$(LN_S) halt reboot > /dev/null 2>&1 || true )
 endif
+if TARGET_GENTOO
+	( cd $(DESTDIR)$(pkgsysconfdir)/system && \
+		rm -f display-manager.service && \
+		$(LN_S) $(systemunitdir)/xdm.service display-manager.service )
+	( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
+		rm -f display-manager.service && \
+		$(LN_S) ../display-manager.service display-manager.service )
+endif
 
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-udevrulesdir=$$dc_install_base/$(udevrulesdir)
diff --git a/units/gentoo/reboot.service b/units/gentoo/reboot.service
index 92c4962..080a084 100644
--- a/units/gentoo/reboot.service
+++ b/units/gentoo/reboot.service
@@ -14,5 +14,4 @@ Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.a
 [Service]
 Type=finish
 ValidNoProcess=yes
-Environment=RUNLEVEL=6
 ExecStart=/etc/init.d/reboot.sh
diff --git a/units/gentoo/xdm.service b/units/gentoo/xdm.service
index 8394991..8370ef2 100644
--- a/units/gentoo/xdm.service
+++ b/units/gentoo/xdm.service
@@ -8,7 +8,8 @@
 [Unit]
 Description=Display Manager
 Before=graphical.target
-After=basic.target syslog.target messagebus.service haldaemon.service
+Requires=basic.target
+After=basic.target syslog.target dbus.service hald.service
 Conflicts=shutdown.target
 
 [Service]