From b2c23da8cea1987a1a329f5a964d3299b7ca7890 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 11 May 2015 22:51:49 +0200 Subject: core: rename SystemdRunningAs to ManagerRunningAs It's primarily just a property of the Manager object after all, and we try to refer to PID 1 as "manager" instead of "systemd", hence let's to stick to this here too. --- src/core/service.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/service.c') diff --git a/src/core/service.c b/src/core/service.c index d11bcb1028..0842ef1b94 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -1121,7 +1121,7 @@ static int service_spawn( goto fail; } - if (UNIT(s)->manager->running_as != SYSTEMD_SYSTEM) + if (UNIT(s)->manager->running_as != MANAGER_SYSTEM) if (asprintf(our_env + n_env++, "MANAGERPID="PID_FMT, getpid()) < 0) { r = -ENOMEM; goto fail; @@ -1181,7 +1181,7 @@ static int service_spawn( #ifdef ENABLE_KDBUS if (s->exec_context.bus_endpoint) { - r = bus_kernel_create_endpoint(UNIT(s)->manager->running_as == SYSTEMD_SYSTEM ? "system" : "user", + r = bus_kernel_create_endpoint(UNIT(s)->manager->running_as == MANAGER_SYSTEM ? "system" : "user", UNIT(s)->id, &bus_endpoint_path); if (r < 0) goto fail; -- cgit v1.2.3-54-g00ecf