if (!scope)
return log_oom();
- r = manager_start_scope(s->manager, scope, s->leader, s->user->slice, description, "logind.service", "systemd-user-sessions.service", &error, &job);
+ r = manager_start_scope(s->manager, scope, s->leader, s->user->slice, description, "systemd-logind.service", "systemd-user-sessions.service", &error, &job);
if (r < 0) {
log_error("Failed to start session scope %s: %s %s",
scope, bus_error_message(&error, r), error.name);
return r;
} else {
s->scope = scope;
+
free(s->scope_job);
s->scope_job = job;
}
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);
if (s->fifo_path) {
unlink(s->fifo_path);
- free(s->fifo_path);
- s->fifo_path = NULL;
+ s->fifo_path = mfree(s->fifo_path);
}
}
#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;
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
r = fchown(vt, s->user->uid, -1);
if (r < 0) {
- r = -errno;
- log_error_errno(errno, "Cannot change owner of /dev/tty%u: %m", s->vtnr);
+ r = log_error_errno(errno,
+ "Cannot change owner of /dev/tty%u: %m",
+ s->vtnr);
goto error;
}
r = ioctl(vt, KDSKBMODE, K_OFF);
if (r < 0) {
- r = -errno;
- log_error_errno(errno, "Cannot set K_OFF on /dev/tty%u: %m", s->vtnr);
+ r = log_error_errno(errno,
+ "Cannot set K_OFF on /dev/tty%u: %m",
+ s->vtnr);
goto error;
}
r = ioctl(vt, KDSETMODE, KD_GRAPHICS);
if (r < 0) {
- r = -errno;
- log_error_errno(errno, "Cannot set KD_GRAPHICS on /dev/tty%u: %m", s->vtnr);
+ r = log_error_errno(errno,
+ "Cannot set KD_GRAPHICS on /dev/tty%u: %m",
+ s->vtnr);
goto error;
}
mode.acqsig = SIGRTMIN + 1;
r = ioctl(vt, VT_SETMODE, &mode);
if (r < 0) {
- r = -errno;
- log_error_errno(errno, "Cannot set VT_PROCESS on /dev/tty%u: %m", s->vtnr);
+ r = log_error_errno(errno,
+ "Cannot set VT_PROCESS on /dev/tty%u: %m",
+ s->vtnr);
goto error;
}