chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename formats-util.h to format-util.h
[elogind.git]
/
src
/
login
/
elogind.c
diff --git
a/src/login/elogind.c
b/src/login/elogind.c
index de12c8119e2008c1a72e864f096363e076529789..5da9ae6a2d7536462726c7cd7469ff9741a35b48 100644
(file)
--- 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);
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;
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',"
m->bus,
NULL,
"type='signal',"
- "interface='org.freedesktop.
elogind
.Agent',"
+ "interface='org.freedesktop.
login1
.Agent',"
"member='Released',"
"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");
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 (!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) {
return 0;
if (m->cgroups_agent_fd < 0) {