Merge pull request #5 from elogind/dev_v227

[elogind.git] / src / login / logind.c

diff --git a/src/login/logind.c b/src/login/logind.c
index 0b7d9653a7621b92fc17dc2c346e29bb5e7c6ecf..2e4342b0aedf4af9792bae02018107ac46fca38e 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;
@@ -218,8 +218,8 @@ static void manager_free(Manager *m) {
         /* Avoid the creation of new processes forked by the
          * 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);
+        if (detect_container() <= 0)
+                (void) cg_uninstall_release_agent(SYSTEMD_CGROUP_CONTROLLER);
 
         manager_shutdown_cgroup(m, true);