From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 10 Sep 2010 23:31:58 +0000 (+0200)
Subject: service: don't automatically add D-Bus service name as an alias to all dbus service... 
X-Git-Tag: v10~20
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=ee0dd8021b3d6203235c8b0cd014431c8fb38d8f

service: don't automatically add D-Bus service name as an alias to all dbus service, rely on manual symlinks to allow disabling of dbus services
---

diff --git a/src/service.c b/src/service.c
index efa52778a..1dc3e1ea0 100644
--- a/src/service.c
+++ b/src/service.c
@@ -824,22 +824,6 @@ static int service_load_sysv(Service *s) {
         return 0;
 }
 
-static int service_add_bus_name(Service *s) {
-        char *n;
-        int r;
-
-        assert(s);
-        assert(s->bus_name);
-
-        if (asprintf(&n, "dbus-%s.service", s->bus_name) < 0)
-                return 0;
-
-        r = unit_merge_by_name(UNIT(s), n);
-        free(n);
-
-        return r;
-}
-
 static int service_verify(Service *s) {
         assert(s);
 
@@ -929,13 +913,9 @@ static int service_load(Unit *u) {
                 if ((r = sysv_fix_order(s)) < 0)
                         return r;
 
-                if (s->bus_name) {
-                        if ((r = service_add_bus_name(s)) < 0)
-                                return r;
-
+                if (s->bus_name)
                         if ((r = unit_watch_bus_name(u, s->bus_name)) < 0)
                                 return r;
-                }
 
                 if (s->type == SERVICE_NOTIFY && s->notify_access == NOTIFY_NONE)
                         s->notify_access = NOTIFY_MAIN;