if (!s)
return NULL;
- s->state_file = strappend("/run/systemd/seat/", id);
+ s->state_file = strappend("/run/systemd/seats/", id);
if (!s->state_file) {
free(s);
return NULL;
assert(s);
- r = safe_mkdir("/run/systemd/seat", 0755, 0, 0);
+ if (!s->started)
+ return 0;
+
+ r = safe_mkdir("/run/systemd/seats", 0755, 0, 0);
if (r < 0)
goto finish;
return r;
}
-static int seat_preallocate_vts(Seat *s) {
+int seat_preallocate_vts(Seat *s) {
int r = 0;
unsigned i;
assert(s);
assert(s->manager);
+ log_debug("Preallocating VTs...");
+
if (s->manager->n_autovts <= 0)
return 0;
if (!seat_is_vtconsole(s))
return 0;
- for (i = 1; i < s->manager->n_autovts; i++) {
+ for (i = 1; i <= s->manager->n_autovts; i++) {
int q;
q = vt_allocate(i);
Session *old_active;
assert(s);
- assert(session);
- assert(session->seat == s);
+ assert(!session || session->seat == s);
if (session == s->active)
return 0;
if (!session || session->started)
seat_send_changed(s, "ActiveSession\0");
+ seat_save(s);
+
+ if (session) {
+ session_save(session);
+ user_save(session->user);
+ }
+
+ if (old_active) {
+ session_save(old_active);
+ user_save(old_active->user);
+ }
+
return 0;
}
/* Read current VT */
seat_read_active_vt(s);
+ s->started = true;
+
/* Save seat data */
seat_save(s);
- s->started = true;
-
seat_send_signal(s, true);
return 0;
assert(s);
- if (!s->started)
- return 0;
-
- log_info("Removed seat %s.", s->id);
-
- seat_send_signal(s, false);
+ if (s->started)
+ log_info("Removed seat %s.", s->id);
seat_stop_sessions(s);
unlink(s->state_file);
seat_add_to_gc_queue(s);
+ if (s->started)
+ seat_send_signal(s, false);
+
s->started = false;
return r;