diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-05-11 22:51:49 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-05-11 22:51:49 +0200 |
| commit | b2c23da8cea1987a1a329f5a964d3299b7ca7890 (patch) | |
| tree | 66f369f148c30ef8d63b32cc33686b0370c6cbf8 /src/core/cgroup.c | |
| parent | 8b4305c7354f572fa0390b7580ba30af741aa0a5 (diff) | |
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.
Diffstat (limited to 'src/core/cgroup.c')
| -rw-r--r-- | src/core/cgroup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/cgroup.c b/src/core/cgroup.c index e337c0fd13..6474e08bd2 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -908,7 +908,7 @@ int manager_setup_cgroup(Manager *m) { /* LEGACY: Already in /system.slice? If so, let's cut this * off. This is to support live upgrades from older systemd * versions where PID 1 was moved there. */ - if (m->running_as == SYSTEMD_SYSTEM) { + if (m->running_as == MANAGER_SYSTEM) { char *e; e = endswith(m->cgroup_root, "/" SPECIAL_SYSTEM_SLICE); @@ -933,7 +933,7 @@ int manager_setup_cgroup(Manager *m) { if (!m->test_run) { /* 3. Install agent */ - if (m->running_as == SYSTEMD_SYSTEM) { + if (m->running_as == MANAGER_SYSTEM) { r = cg_install_release_agent(SYSTEMD_CGROUP_CONTROLLER, SYSTEMD_CGROUP_AGENT_PATH); if (r < 0) log_warning_errno(r, "Failed to install release agent, ignoring: %m"); |