chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: split --help into multiple sections
[elogind.git]
/
src
/
logind-seat.c
diff --git
a/src/logind-seat.c
b/src/logind-seat.c
index 12a1b806470efee273cc7a891c20d4afede58f3b..3cf3958c8d47330d13cac925573238713a54ef55 100644
(file)
--- a/
src/logind-seat.c
+++ b/
src/logind-seat.c
@@
-41,7
+41,7
@@
Seat *seat_new(Manager *m, const char *id) {
if (!s)
return NULL;
if (!s)
return NULL;
- s->state_file = strappend("/run/systemd/seat/", id);
+ s->state_file = strappend("/run/systemd/seat
s
/", id);
if (!s->state_file) {
free(s);
return NULL;
if (!s->state_file) {
free(s);
return NULL;
@@
-86,7
+86,10
@@
int seat_save(Seat *s) {
assert(s);
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;
if (r < 0)
goto finish;
@@
-114,27
+117,20
@@
int seat_save(Seat *s) {
if (s->sessions) {
Session *i;
if (s->sessions) {
Session *i;
- fputs("
OTHER
=", f);
+ fputs("
SESSIONS
=", f);
LIST_FOREACH(sessions_by_seat, i, s->sessions) {
LIST_FOREACH(sessions_by_seat, i, s->sessions) {
- if (i == s->active)
- continue;
-
fprintf(f,
"%s%c",
i->id,
i->sessions_by_seat_next ? ' ' : '\n');
}
fprintf(f,
"%s%c",
i->id,
i->sessions_by_seat_next ? ' ' : '\n');
}
- fputs("OTHER_UIDS=", f);
- LIST_FOREACH(sessions_by_seat, i, s->sessions) {
- if (i == s->active)
- continue;
-
+ fputs("UIDS=", f);
+ LIST_FOREACH(sessions_by_seat, i, s->sessions)
fprintf(f,
"%lu%c",
(unsigned long) i->user->uid,
i->sessions_by_seat_next ? ' ' : '\n');
fprintf(f,
"%lu%c",
(unsigned long) i->user->uid,
i->sessions_by_seat_next ? ' ' : '\n');
- }
}
fflush(f);
}
fflush(f);
@@
-183,20
+179,22
@@
static int vt_allocate(int vtnr) {
return r;
}
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);
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;
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);
int q;
q = vt_allocate(i);
@@
-246,6
+244,18
@@
int seat_set_active(Seat *s, Session *session) {
if (!session || session->started)
seat_send_changed(s, "ActiveSession\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;
}
return 0;
}
@@
-327,11
+337,11
@@
int seat_start(Seat *s) {
/* Read current VT */
seat_read_active_vt(s);
/* Read current VT */
seat_read_active_vt(s);
+ s->started = true;
+
/* Save seat data */
seat_save(s);
/* Save seat data */
seat_save(s);
- s->started = true;
-
seat_send_signal(s, true);
return 0;
seat_send_signal(s, true);
return 0;
@@
-342,18
+352,17
@@
int seat_stop(Seat *s) {
assert(s);
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);
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;
s->started = false;
return r;
@@
-437,9
+446,12
@@
int seat_get_idle_hint(Seat *s, dual_timestamp *t) {
return idle_hint;
}
return idle_hint;
}
-int seat_check_gc(Seat *s) {
+int seat_check_gc(Seat *s
, bool drop_not_started
) {
assert(s);
assert(s);
+ if (drop_not_started && !s->started)
+ return 0;
+
if (seat_is_vtconsole(s))
return 1;
if (seat_is_vtconsole(s))
return 1;
@@
-480,5
+492,8
@@
bool seat_name_is_valid(const char *name) {
if (!seat_name_valid_char(*p))
return false;
if (!seat_name_valid_char(*p))
return false;
+ if (strlen(name) > 255)
+ return false;
+
return true;
}
return true;
}