X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Felogind.c;h=5da9ae6a2d7536462726c7cd7469ff9741a35b48;hb=a5c28308446550e0966825472babdf123fc976ac;hp=de12c8119e2008c1a72e864f096363e076529789;hpb=7f72c07c5a325307ae00fc6759912e096d2c8c82;p=elogind.git diff --git a/src/login/elogind.c b/src/login/elogind.c index de12c8119..5da9ae6a2 100644 --- a/src/login/elogind.c +++ b/src/login/elogind.c @@ -42,7 +42,7 @@ static int signal_agent_released(sd_bus_message *message, void *userdata, sd_bus assert(message); assert(m); - /* only accept org.freedesktop.elogind.Agent from UID=0 */ + /* only accept org.freedesktop.login1.Agent from UID=0 */ r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_EUID, &creds); if (r < 0) return r; @@ -77,9 +77,9 @@ void elogind_bus_setup_system(Manager* m) { m->bus, NULL, "type='signal'," - "interface='org.freedesktop.elogind.Agent'," + "interface='org.freedesktop.login1.Agent'," "member='Released'," - "path='/org/freedesktop/elogind/agent'", + "path='/org/freedesktop.login1/agent'", signal_agent_released, m); if (r < 0) log_warning_errno(r, "Failed to register Released match on system bus: %m"); @@ -145,7 +145,7 @@ int elogind_setup_cgroups_agent(Manager *m) { if (!MANAGER_IS_SYSTEM(m)) return 0; - if (cg_unified() > 0) /* We don't need this anymore on the unified hierarchy */ + if (cg_unified(SYSTEMD_CGROUP_CONTROLLER) > 0) /* We don't need this anymore on the unified hierarchy */ return 0; if (m->cgroups_agent_fd < 0) {