return NULL;
}
- if (asprintf(&u->state_file, "/run/systemd/user/%lu", (unsigned long) uid) < 0) {
+ if (asprintf(&u->state_file, "/run/systemd/users/%lu", (unsigned long) uid) < 0) {
free(u->name);
free(u);
return NULL;
assert(u);
assert(u->state_file);
- r = safe_mkdir("/run/systemd/user", 0755, 0, 0);
+ if (!u->started)
+ return 0;
+
+ r = safe_mkdir("/run/systemd/users", 0755, 0, 0);
if (r < 0)
goto finish;
int user_load(User *u) {
int r;
char *display = NULL;
- Session *s;
+ Session *s = NULL;
assert(u);
return r;
}
- s = hashmap_get(u->manager->sessions, display);
- free(display);
+ if (display) {
+ s = hashmap_get(u->manager->sessions, display);
+ free(display);
+ }
- if (s && s->display && x11_display_is_local(s->display))
+ if (s && s->display && display_is_local(s->display))
u->display = s;
return r;
r = cg_create(SYSTEMD_CGROUP_CONTROLLER, p);
if (r < 0) {
+ log_error("Failed to create cgroup "SYSTEMD_CGROUP_CONTROLLER":%s: %s", p, strerror(-r));
free(p);
u->cgroup_path = NULL;
- log_error("Failed to create cgroup "SYSTEMD_CGROUP_CONTROLLER":%s: %s", p, strerror(-r));
return r;
}
u->cgroup_path = p;
STRV_FOREACH(k, u->manager->controllers) {
+
+ if (strv_contains(u->manager->reset_controllers, *k))
+ continue;
+
r = cg_create(*k, p);
if (r < 0)
log_warning("Failed to create cgroup %s:%s: %s", *k, p, strerror(-r));
assert(u);
+ if (u->started)
+ return 0;
+
+ log_info("New user %s logged in.", u->name);
+
/* Make XDG_RUNTIME_DIR */
r = user_mkdir_runtime_path(u);
if (r < 0)
if (r < 0)
return r;
+ dual_timestamp_get(&u->timestamp);
+
+ u->started = true;
+
/* Save new user data */
user_save(u);
- dual_timestamp_get(&u->timestamp);
-
user_send_signal(u, true);
return 0;
static int user_shall_kill(User *u) {
assert(u);
- return u->manager->kill_user_processes;
+ if (!u->manager->kill_user_processes)
+ return false;
+
+ if (strv_contains(u->manager->kill_exclude_users, u->name))
+ return false;
+
+ if (strv_isempty(u->manager->kill_only_users))
+ return true;
+
+ return strv_contains(u->manager->kill_only_users, u->name);
}
static int user_kill_cgroup(User *u) {
int r = 0, k;
assert(u);
+ if (u->started)
+ log_info("User %s logged out.", u->name);
+
LIST_FOREACH(sessions_by_user, s, u->sessions) {
k = session_stop(s);
if (k < 0)
r = k;
}
- user_send_signal(u, false);
-
/* Kill systemd */
k = user_stop_service(u);
if (k < 0)
unlink(u->state_file);
user_add_to_gc_queue(u);
+ if (u->started)
+ user_send_signal(u, false);
+
+ u->started = false;
+
return r;
}
return idle_hint;
}
-int user_check_gc(User *u) {
+int user_check_gc(User *u, bool drop_not_started) {
int r;
char *p;
assert(u);
+ if (drop_not_started && !u->started)
+ return 0;
+
if (u->sessions)
return 1;