From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Date: Thu, 20 May 2010 21:54:59 +0000 (+0200)
Subject: units: fix Gentoo services
X-Git-Tag: 0.git+20100605+dfd8ee-1~11^2^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f306f4c40d7004be058678ff3ed90c9c006767e0;p=systemd

units: fix Gentoo services
---

diff --git a/Makefile.am b/Makefile.am
index bd252392..a15777e3 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 92c4962a..080a084c 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 83949919..8370ef24 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]