diff options
| author | Kay Sievers <kay@vrfy.org> | 2015-06-17 19:06:13 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2015-06-17 19:06:13 +0200 |
| commit | 633f2d59edeb3aa9cf88454780d55fac2e4dbe8d (patch) | |
| tree | 18a6a29c7d5f6dd0e5af54a7859898d96c78601d /src/core/service.c | |
| parent | 14f494c710bec8fcbadb5f46a9c25b9ebf367f19 (diff) | |
| parent | 1b09f548c7f303b486b5b1321c06336bff72ada4 (diff) | |
Merge pull request #263 from kaysievers/wip
turn kdbus support into a runtime option
Diffstat (limited to 'src/core/service.c')
| -rw-r--r-- | src/core/service.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/core/service.c b/src/core/service.c index 71252e29e2..fa1e80b710 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -568,14 +568,12 @@ static int service_add_extras(Service *s) { s->notify_access = NOTIFY_MAIN; if (s->bus_name) { -#ifdef ENABLE_KDBUS const char *n; n = strjoina(s->bus_name, ".busname"); r = unit_add_dependency_by_name(UNIT(s), UNIT_AFTER, n, NULL, true); if (r < 0) return r; -#endif r = unit_watch_bus_name(UNIT(s), s->bus_name); if (r < 0) @@ -1180,7 +1178,6 @@ static int service_spawn( } else path = UNIT(s)->cgroup_path; -#ifdef ENABLE_KDBUS if (s->exec_context.bus_endpoint) { r = bus_kernel_create_endpoint(UNIT(s)->manager->running_as == MANAGER_SYSTEM ? "system" : "user", UNIT(s)->id, &bus_endpoint_path); @@ -1192,7 +1189,6 @@ static int service_spawn( * as the service is running. */ exec_params.bus_endpoint_fd = s->bus_endpoint_fd = r; } -#endif exec_params.argv = argv; exec_params.fds = fds; |