units: fix Gentoo services

diff --git a/Makefile.am b/Makefile.am
index bd2523923ee03817410525d50babe8f293d8ced6..a15777e36fce570c899f130beba28db994a3348b 100644 (file)
--- 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 92c4962a605ec8e405ea58ab9e2ca918ba034070..080a084c750fdb46d609c2b3cce2a8f8e5e7873b 100644 (file)
--- 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 83949919d329b22b897b17b35b4b6838af7834ed..8370ef24f8bf1bd9a1b11ad8f5ec48830759c316 100644 (file)
--- 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]