mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-15 21:13:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lennart Poettering 2010-09-11 01:31:58 +02:00
parent 88ac58d76b
commit ee0dd8021b
1 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/service.c
View File

@ -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;