diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2017-03-14 11:56:01 +0100 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-03-14 12:12:32 +0100 |
| commit | 9627cf72cb14c83d0f40902779a73fe756c50efe (patch) | |
| tree | cb8398f269852608decbf32d920e19f5e435e403 /src/login | |
| parent | 3d1092eab0f4a5c771225c78072a7b6eccb82849 (diff) | |
Rename ELOGIND_CGROUP_CONTROLLER back to SYSTEMD_CGROUP_CONTROLLER
Although it is nice to have it read ELOGIND instead of SYSTEMD, all
diffs just show too many irrelevant (false) positives.
Diffstat (limited to 'src/login')
| -rw-r--r-- | src/login/loginctl.c | 4 | ||||
| -rw-r--r-- | src/login/logind-session.c | 8 | ||||
| -rw-r--r-- | src/login/logind.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/login/loginctl.c b/src/login/loginctl.c index d7b64f9e9..babfa349c 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -284,7 +284,7 @@ static int show_unit_cgroup(sd_bus *bus, const char *interface, const char *unit if (isempty(cgroup)) return 0; - if (cg_is_empty_recursive(ELOGIND_CGROUP_CONTROLLER, cgroup) != 0 && leader <= 0) + if (cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, cgroup) != 0 && leader <= 0) return 0; c = columns(); @@ -293,7 +293,7 @@ static int show_unit_cgroup(sd_bus *bus, const char *interface, const char *unit else c = 0; - show_cgroup_and_extra(ELOGIND_CGROUP_CONTROLLER, cgroup, "\t\t ", c, false, &leader, leader > 0, get_output_flags()); + show_cgroup_and_extra(SYSTEMD_CGROUP_CONTROLLER, cgroup, "\t\t ", c, false, &leader, leader > 0, get_output_flags()); return 0; } #endif // 0 diff --git a/src/login/logind-session.c b/src/login/logind-session.c index bbfbeac53..016886805 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -558,11 +558,11 @@ static int session_start_cgroup(Session *s) { assert(s->leader > 0); /* First, create our own group */ - r = cg_create(ELOGIND_CGROUP_CONTROLLER, s->id); + r = cg_create(SYSTEMD_CGROUP_CONTROLLER, s->id); if (r < 0) return log_error_errno(r, "Failed to create cgroup %s: %m", s->id); - r = cg_attach(ELOGIND_CGROUP_CONTROLLER, s->id, s->leader); + r = cg_attach(SYSTEMD_CGROUP_CONTROLLER, s->id, s->leader); if (r < 0) log_warning_errno(r, "Failed to attach PID %d to cgroup %s: %m", s->leader, s->id); @@ -1012,7 +1012,7 @@ bool session_check_gc(Session *s, bool drop_not_started) { #endif // 0 if ( s->user->manager - && (cg_is_empty_recursive (ELOGIND_CGROUP_CONTROLLER, s->user->manager->cgroup_root) > 0) ) + && (cg_is_empty_recursive (SYSTEMD_CGROUP_CONTROLLER, s->user->manager->cgroup_root) > 0) ) return true; return false; @@ -1073,7 +1073,7 @@ int session_kill(Session *s, KillWho who, int signo) { bool sigcont = false; bool ignore_self = true; bool rem = true; - return cg_kill_recursive (ELOGIND_CGROUP_CONTROLLER, s->id, signo, + return cg_kill_recursive (SYSTEMD_CGROUP_CONTROLLER, s->id, signo, sigcont, ignore_self, rem, NULL); } #endif // 0 diff --git a/src/login/logind.c b/src/login/logind.c index 0b7d9653a..9e637c741 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -97,7 +97,7 @@ static Manager *manager_new(void) { goto fail; /* If elogind should be its own controller, mount its cgroup */ - if (streq(ELOGIND_CGROUP_CONTROLLER, "name=elogind")) { + if (streq(SYSTEMD_CGROUP_CONTROLLER, "name=elogind")) { r = mount_setup(true); if (r < 0) goto fail; @@ -219,7 +219,7 @@ static void manager_free(Manager *m) { * kernel; at this point, we will not listen to the * signals anyway */ if (detect_container(NULL) <= 0) - (void) cg_uninstall_release_agent(ELOGIND_CGROUP_CONTROLLER); + (void) cg_uninstall_release_agent(SYSTEMD_CGROUP_CONTROLLER); manager_shutdown_cgroup(m, true); |