From: Kay Sievers <kay@vrfy.org>
Date: Mon, 6 Jan 2014 22:37:23 +0000 (+0800)
Subject: core: do not add implicit dbus.socket dependency
X-Git-Tag: v209~519
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=ca76186598c56da9f08b7eb55b6915d9e2344570

core: do not add implicit dbus.socket dependency

Sockets are ordered before sockets.target anyway, and sockets.target
is ordered before basic.target, and hence all bus services end up
being ordered after dbus.socket anyway. Since for kdbus clients
dbus.socket is obsolete, let's not add this dependency explicitly.

Also, it's hot in Australia and we are going for breakfast now.
---

diff --git a/src/core/service.c b/src/core/service.c
index 23810b39a..a2f0e3577 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1235,12 +1235,6 @@ static int service_load(Unit *u) {
                 if (s->watchdog_usec > 0 && s->notify_access == NOTIFY_NONE)
                         s->notify_access = NOTIFY_MAIN;
 
-                if (s->type == SERVICE_DBUS || s->bus_name) {
-                        r = unit_add_two_dependencies_by_name(u, UNIT_AFTER, UNIT_REQUIRES, SPECIAL_DBUS_SOCKET, NULL, true);
-                        if (r < 0)
-                                return r;
-                }
-
                 if (UNIT(s)->default_dependencies) {
                         r = service_add_default_dependencies(s);
                         if (r < 0)