[systemd-commits] 2 commits - src/core units/user

[Kay Sievers]

 src/core/service.c                   |    6 ------
 units/user/systemd-bus-proxyd.socket |    1 +
 2 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit ca76186598c56da9f08b7eb55b6915d9e2344570
Author: Kay Sievers <kay at vrfy.org>
Date:   Tue Jan 7 06:37:23 2014 +0800

    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 23810b3..a2f0e35 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)

commit 1bc86acd10f9238f1f477bb6dc45729ab0d2b5e9
Author: Kay Sievers <kay at vrfy.org>
Date:   Tue Jan 7 06:36:39 2014 +0800

    bus-proxyd: --user -- add Accept=yes to socket

diff --git a/units/user/systemd-bus-proxyd.socket b/units/user/systemd-bus-proxyd.socket
index b9efc0e..412052a 100644
--- a/units/user/systemd-bus-proxyd.socket
+++ b/units/user/systemd-bus-proxyd.socket
@@ -10,3 +10,4 @@ Description=Legacy D-Bus Protocol Compatibility Socket
 
 [Socket]
 ListenStream=%t/bus
+Accept=yes