summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-09-11 01:31:58 +0200
committerLennart Poettering <lennart@poettering.net>2010-09-11 01:31:58 +0200
commitee0dd8021b3d6203235c8b0cd014431c8fb38d8f (patch)
tree88e9da798bb728a60899fd0fa85f099719b93e3f
parent88ac58d76b9e4316956a7775abe0eace17a9e757 (diff)
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
-rw-r--r--src/service.c22
1 files changed, 1 insertions, 21 deletions
diff --git a/src/service.c b/src/service.c
index efa52778a6..1dc3e1ea00 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;