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.

diff --git a/Makefile.am b/Makefile.am
index c403adc94ee3ac302322eaab08ca0ea10c49df07..c16eb5d0acfbed3e3123efbb19110c9c17777cec 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -121,7 +121,7 @@ CLEANFILES = $(BUILT_SOURCES) \
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
        -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
-       -DELOGIND_CGROUP_CONTROLLER=\"$(CGROUP_CONTROLLER)\" \
+       -DSYSTEMD_CGROUP_CONTROLLER=\"$(CGROUP_CONTROLLER)\" \
        -DELOGIND_CGROUP_AGENT_PATH=\"$(pkglibexecdir)/elogind-cgroups-agent\" \
        -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
        -DPOLKIT_AGENT_BINARY_PATH=\"$(PKTTYAGENT)\" \

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index b48642588da94c78efb5393094cb8582da8e1d7b..5cbe45a7e65d3a515e439687cf3cedd16dc97966 100644 (file)
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -574,7 +574,7 @@ static int controller_is_accessible(const char *controller) {
                 /* We don't support named hierarchies if we are using
                  * the unified hierarchy. */
 
-                if (streq(controller, ELOGIND_CGROUP_CONTROLLER))
+                if (streq(controller, SYSTEMD_CGROUP_CONTROLLER))
                         return 0;
 
                 if (startswith(controller, "name="))
@@ -820,7 +820,7 @@ int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
                         if (!cg_controller_is_valid(controller))
                                 return -EINVAL;
                 } else
-                        controller = ELOGIND_CGROUP_CONTROLLER;
+                        controller = SYSTEMD_CGROUP_CONTROLLER;
 
                 cs = strlen(controller);
         }
@@ -1159,7 +1159,7 @@ int cg_mangle_path(const char *path, char **result) {
         if (r < 0)
                 return r;
 
-        return cg_get_path(c ? c : ELOGIND_CGROUP_CONTROLLER, p ? p : "/", NULL, result);
+        return cg_get_path(c ? c : SYSTEMD_CGROUP_CONTROLLER, p ? p : "/", NULL, result);
 }
 
 int cg_get_root_path(char **path) {
@@ -1170,7 +1170,7 @@ int cg_get_root_path(char **path) {
 
         assert(path);
 
-        r = cg_pid_get_path(ELOGIND_CGROUP_CONTROLLER, 1, &p);
+        r = cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, 1, &p);
         if (r < 0)
                 return r;
 
@@ -1186,7 +1186,7 @@ int cg_get_root_path(char **path) {
         return 0;
 #else
         assert(path);
-        return cg_pid_get_path(ELOGIND_CGROUP_CONTROLLER, 1, path);
+        return cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, 1, path);
 #endif // 0
 }
 
@@ -1227,7 +1227,7 @@ int cg_pid_get_path_shifted(pid_t pid, const char *root, char **cgroup) {
         assert(pid >= 0);
         assert(cgroup);
 
-        r = cg_pid_get_path(ELOGIND_CGROUP_CONTROLLER, pid, &raw);
+        r = cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, pid, &raw);
         if (r < 0)
                 return r;
 
@@ -1885,7 +1885,7 @@ int cg_create_everywhere(CGroupMask supported, CGroupMask mask, const char *path
          * in all others */
 
         /* First create the cgroup in our own hierarchy. */
-        r = cg_create(ELOGIND_CGROUP_CONTROLLER, path);
+        r = cg_create(SYSTEMD_CGROUP_CONTROLLER, path);
         if (r < 0)
                 return r;
 
@@ -1916,7 +1916,7 @@ int cg_attach_everywhere(CGroupMask supported, const char *path, pid_t pid, cg_m
         CGroupController c;
         int r, unified;
 
-        r = cg_attach(ELOGIND_CGROUP_CONTROLLER, path, pid);
+        r = cg_attach(SYSTEMD_CGROUP_CONTROLLER, path, pid);
         if (r < 0)
                 return r;
 
@@ -1967,7 +1967,7 @@ int cg_migrate_everywhere(CGroupMask supported, const char *from, const char *to
         int r = 0, unified;
 
         if (!path_equal(from, to))  {
-                r = cg_migrate_recursive(ELOGIND_CGROUP_CONTROLLER, from, ELOGIND_CGROUP_CONTROLLER, to, false, true);
+                r = cg_migrate_recursive(SYSTEMD_CGROUP_CONTROLLER, from, SYSTEMD_CGROUP_CONTROLLER, to, false, true);
                 if (r < 0)
                         return r;
         }
@@ -1991,7 +1991,7 @@ int cg_migrate_everywhere(CGroupMask supported, const char *from, const char *to
                         if (!p)
                                 p = to;
 
-                (void) cg_migrate_recursive_fallback(ELOGIND_CGROUP_CONTROLLER, to, cgroup_controller_to_string(c), p, false, false);
+                (void) cg_migrate_recursive_fallback(SYSTEMD_CGROUP_CONTROLLER, to, cgroup_controller_to_string(c), p, false, false);
         }
 
         return 0;
@@ -2001,7 +2001,7 @@ int cg_trim_everywhere(CGroupMask supported, const char *path, bool delete_root)
         CGroupController c;
         int r, unified;
 
-        r = cg_trim(ELOGIND_CGROUP_CONTROLLER, path, delete_root);
+        r = cg_trim(SYSTEMD_CGROUP_CONTROLLER, path, delete_root);
         if (r < 0)
                 return r;
 
@@ -2047,7 +2047,7 @@ int cg_mask_supported(CGroupMask *ret) {
                 if (r < 0)
                         return r;
 
-                r = cg_get_path(ELOGIND_CGROUP_CONTROLLER, root, "cgroup.controllers", &path);
+                r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, root, "cgroup.controllers", &path);
                 if (r < 0)
                         return r;
 
@@ -2212,7 +2212,7 @@ int cg_enable_everywhere(CGroupMask supported, CGroupMask mask, const char *p) {
         if (!unified) /* on the legacy hiearchy there's no joining of controllers defined */
                 return 0;
 
-        r = cg_get_path(ELOGIND_CGROUP_CONTROLLER, p, "cgroup.subtree_control", &fs);
+        r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, p, "cgroup.subtree_control", &fs);
         if (r < 0)
                 return r;
 

diff --git a/src/basic/def.h b/src/basic/def.h
index f4ca626d22b490b36dbd657d8950d83270aea86c..561dab66e84cfcf3e77b7b46e833441c07fbec9a 100644 (file)
--- a/src/basic/def.h
+++ b/src/basic/def.h
@@ -35,8 +35,8 @@
  * the watchdog pings will keep the loop busy. */
 #define DEFAULT_EXIT_USEC (30*USEC_PER_SEC)
 
-#ifndef ELOGIND_CGROUP_CONTROLLER
-#  define ELOGIND_CGROUP_CONTROLLER "name=elogind"
+#ifndef SYSTEMD_CGROUP_CONTROLLER
+#  define SYSTEMD_CGROUP_CONTROLLER "name=elogind"
 #endif
 
 #define SIGNALS_CRASH_HANDLER SIGSEGV,SIGILL,SIGFPE,SIGBUS,SIGQUIT,SIGABRT

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 567fe2d4dd36ba5d42a9079f5ba8e68380899691..54da47182f29ad4f8736b5019b35d668e11a1065 100644 (file)
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -762,7 +762,7 @@ int unit_watch_cgroup(Unit *u) {
         if (r < 0)
                 return log_oom();
 
-        r = cg_get_path(ELOGIND_CGROUP_CONTROLLER, u->cgroup_path, "cgroup.populated", &populated);
+        r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, "cgroup.populated", &populated);
         if (r < 0)
                 return log_oom();
 
@@ -1053,7 +1053,7 @@ int unit_search_main_pid(Unit *u, pid_t *ret) {
         if (!u->cgroup_path)
                 return -ENXIO;
 
-        r = cg_enumerate_processes(ELOGIND_CGROUP_CONTROLLER, u->cgroup_path, &f);
+        r = cg_enumerate_processes(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, &f);
         if (r < 0)
                 return r;
 
@@ -1090,7 +1090,7 @@ static int unit_watch_pids_in_path(Unit *u, const char *path) {
         assert(u);
         assert(path);
 
-        r = cg_enumerate_processes(ELOGIND_CGROUP_CONTROLLER, path, &f);
+        r = cg_enumerate_processes(SYSTEMD_CGROUP_CONTROLLER, path, &f);
         if (r < 0)
                 ret = r;
         else {
@@ -1106,7 +1106,7 @@ static int unit_watch_pids_in_path(Unit *u, const char *path) {
                         ret = r;
         }
 
-        r = cg_enumerate_subgroups(ELOGIND_CGROUP_CONTROLLER, path, &d);
+        r = cg_enumerate_subgroups(SYSTEMD_CGROUP_CONTROLLER, path, &d);
         if (r < 0) {
                 if (ret >= 0)
                         ret = r;
@@ -1159,7 +1159,7 @@ int unit_notify_cgroup_empty(Unit *u) {
         if (!u->cgroup_path)
                 return 0;
 
-        r = cg_is_empty_recursive(ELOGIND_CGROUP_CONTROLLER, u->cgroup_path);
+        r = cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path);
         if (r <= 0)
                 return r;
 
@@ -1226,7 +1226,7 @@ int manager_setup_cgroup(Manager *m) {
 
         /* 1. Determine hierarchy */
         m->cgroup_root = mfree(m->cgroup_root);
-        r = cg_pid_get_path(ELOGIND_CGROUP_CONTROLLER, 0, &m->cgroup_root);
+        r = cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, 0, &m->cgroup_root);
         if (r < 0)
                 return log_error_errno(r, "Cannot determine cgroup we are running in: %m");
 
@@ -1254,10 +1254,10 @@ int manager_setup_cgroup(Manager *m) {
         while ((e = endswith(m->cgroup_root, "/")))
                 *e = 0;
         log_debug_elogind("Cgroup Controller \"%s\" -> root \"%s\"",
-                          ELOGIND_CGROUP_CONTROLLER, m->cgroup_root);
+                          SYSTEMD_CGROUP_CONTROLLER, m->cgroup_root);
 
         /* 2. Show data */
-        r = cg_get_path(ELOGIND_CGROUP_CONTROLLER, m->cgroup_root, NULL, &path);
+        r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_root, NULL, &path);
         if (r < 0)
                 return log_error_errno(r, "Cannot find cgroup mount point: %m");
 
@@ -1267,7 +1267,7 @@ int manager_setup_cgroup(Manager *m) {
         if (unified > 0)
                 log_debug("Unified cgroup hierarchy is located at %s.", path);
         else
-                log_debug("Using cgroup controller " ELOGIND_CGROUP_CONTROLLER ". File system hierarchy is at %s.", path);
+                log_debug("Using cgroup controller " SYSTEMD_CGROUP_CONTROLLER ". File system hierarchy is at %s.", path);
 
         if (!m->test_run) {
                 const char *scope_path;
@@ -1306,7 +1306,7 @@ int manager_setup_cgroup(Manager *m) {
                          * generate events when control groups with
                          * children run empty. */
 
-                        r = cg_install_release_agent(ELOGIND_CGROUP_CONTROLLER, ELOGIND_CGROUP_AGENT_PATH);
+                        r = cg_install_release_agent(SYSTEMD_CGROUP_CONTROLLER, ELOGIND_CGROUP_AGENT_PATH);
                         if (r < 0)
                                 log_warning_errno(r, "Failed to install release agent, ignoring: %m");
                         else if (r > 0)
@@ -1319,9 +1319,9 @@ int manager_setup_cgroup(Manager *m) {
 #if 0
                 /* 4. Make sure we are in the special "init.scope" unit in the root slice. */
                 scope_path = strjoina(m->cgroup_root, "/" SPECIAL_INIT_SCOPE);
-                r = cg_create_and_attach(ELOGIND_CGROUP_CONTROLLER, scope_path, 0);
+                r = cg_create_and_attach(SYSTEMD_CGROUP_CONTROLLER, scope_path, 0);
 #else
-                if (streq(ELOGIND_CGROUP_CONTROLLER, "name=elogind"))
+                if (streq(SYSTEMD_CGROUP_CONTROLLER, "name=elogind"))
                         // we are our own cgroup controller
                         scope_path = strjoina("");
                 else if (streq(m->cgroup_root, "/elogind"))
@@ -1330,7 +1330,7 @@ int manager_setup_cgroup(Manager *m) {
                 else
                         // we have to create our own group
                         scope_path = strjoina(m->cgroup_root, "/elogind");
-                r = cg_create_and_attach(ELOGIND_CGROUP_CONTROLLER, scope_path, 0);
+                r = cg_create_and_attach(SYSTEMD_CGROUP_CONTROLLER, scope_path, 0);
 #endif // 0
                 if (r < 0)
                         return log_error_errno(r, "Failed to create %s control group: %m", scope_path);
@@ -1339,7 +1339,7 @@ int manager_setup_cgroup(Manager *m) {
                 /* also, move all other userspace processes remaining
                  * in the root cgroup into that scope. */
                 if (!streq(m->cgroup_root, scope_path)) {
-                        r = cg_migrate(ELOGIND_CGROUP_CONTROLLER, m->cgroup_root, ELOGIND_CGROUP_CONTROLLER, scope_path, false);
+                        r = cg_migrate(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_root, SYSTEMD_CGROUP_CONTROLLER, scope_path, false);
                         if (r < 0)
                                 log_warning_errno(r, "Couldn't move remaining userspace processes, ignoring: %m");
                 }
@@ -1372,7 +1372,7 @@ void manager_shutdown_cgroup(Manager *m, bool delete) {
         /* We can't really delete the group, since we are in it. But
          * let's trim it. */
         if (delete && m->cgroup_root)
-                (void) cg_trim(ELOGIND_CGROUP_CONTROLLER, m->cgroup_root, false);
+                (void) cg_trim(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_root, false);
 
 /// elogind does not support the unified hierarchy, yet.
 #if 0
@@ -1425,7 +1425,7 @@ Unit *manager_get_unit_by_pid_cgroup(Manager *m, pid_t pid) {
         if (pid <= 0)
                 return NULL;
 
-        r = cg_pid_get_path(ELOGIND_CGROUP_CONTROLLER, pid, &cgroup);
+        r = cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, pid, &cgroup);
         if (r < 0)
                 return NULL;
 

diff --git a/src/libelogind/sd-login/sd-login.c b/src/libelogind/sd-login/sd-login.c
index 4f625ea335e9874ca322c9d96256398d5649b87e..03d9cdbcb3ee10346a2ff121448fa31da362240a 100644 (file)
--- a/src/libelogind/sd-login/sd-login.c
+++ b/src/libelogind/sd-login/sd-login.c
@@ -138,7 +138,7 @@ _public_ int sd_pid_get_cgroup(pid_t pid, char **cgroup) {
         assert_return(pid >= 0, -EINVAL);
         assert_return(cgroup, -EINVAL);
 
-        r = cg_pid_get_path(ELOGIND_CGROUP_CONTROLLER, pid, &c);
+        r = cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, pid, &c);
         if (r < 0)
                 return r;
 

diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index d7b64f9e9e81654fb4d82b39add8fa830731f2a9..babfa349c9840369f6ee0a7f423b7a4e201a678a 100644 (file)
--- 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 bbfbeac53e0081e0ffa303f97f5c214f17ec9e2b..01688680503be229efb951c0d31207d3712ca949 100644 (file)
--- 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 0b7d9653a7621b92fc17dc2c346e29bb5e7c6ecf..9e637c74166c12d1d22f5ea159be1e039e24a6cd 100644 (file)
--- 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);