Hi again,

You're right gor the dbus service name, I just missed it. Hal service seems
to be haldaemon too, but I'm not 100% sure 'cause I haven't it on my system.
I fixed it and also added a symlink to the xdm service in the
graphical.target.wants in the joined patch.

On 20 May 2010 18:20, Lennart Poettering <[email protected]> wrote:

> On Thu, 20.05.10 10:37, Marc-Antoine Perennou ([email protected])
> wrote:
>
> Heya,
>
> > From 862fbcaa59b022d25b50c7793205daf40bb5817b Mon Sep 17 00:00:00 2001
> > From: Marc-Antoine Perennou <[email protected]>
> > Date: Thu, 20 May 2010 10:31:04 +0200
> > Subject: [PATCH] units: add services for Gentoo
>
> Merged this now. One thing I'd like to point out though:
>
> > +++ b/units/gentoo/xdm.service
> > @@ -0,0 +1,16 @@
> > +#  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
> > +Before=graphical.target
> > +After=basic.target syslog.target messagebus.service haldaemon.service
>
> This seems not right. According to the configur.ac data your dbus
> service is called dbus.service, not messagebus.service (which is a
> fedoraism). Also, are you sure your hal service is called
> haldaemon.service?
>
> Lennart
>
> --
> Lennart Poettering                        Red Hat, Inc.
> lennart [at] poettering [dot] net
> http://0pointer.net/lennart/           GnuPG 0x1A015CC4
> _______________________________________________
> systemd-devel mailing list
> [email protected]
> http://lists.freedesktop.org/mailman/listinfo/systemd-devel
>
From dd7105dfc72e63ad352dc496f269c39b660730c3 Mon Sep 17 00:00:00 2001
From: Marc-Antoine Perennou <[email protected]>
Date: Thu, 20 May 2010 23:54:59 +0200
Subject: [PATCH] units: fix Gentoo services

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

diff --git a/Makefile.am b/Makefile.am
index 8313e57..f491585 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -493,5 +493,11 @@ if TARGET_FEDORA
 		$(LN_S) halt reboot > /dev/null 2>&1 || true )
 endif
 
+if TARGET_GENTOO
+	( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
+		rm -f xdm.service && \
+		$(LN_S) $(systemunitdir)/xdm.service xdm.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..244bd48 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 haldaemon.service
 Conflicts=shutdown.target
 
 [Service]
-- 
1.7.1

_______________________________________________
systemd-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/systemd-devel

Reply via email to