X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind-seat.c;h=ca0e8d7fcfdd0fc2ee2d24938c2845bf5c7596a9;hp=3cf3958c8d47330d13cac925573238713a54ef55;hb=3fdb2494c1e24c0a020f5b54022d2c751fd26f50;hpb=4bba9156da3e1df2cee24d10d7cd88c776ef4179
diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index 3cf3958c8..ca0e8d7fc 100644
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -6,16 +6,16 @@
Copyright 2011 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
***/
@@ -27,9 +27,13 @@
#include
#include
+#include "sd-id128.h"
+#include "sd-messages.h"
#include "logind-seat.h"
#include "logind-acl.h"
#include "util.h"
+#include "mkdir.h"
+#include "path-util.h"
Seat *seat_new(Manager *m, const char *id) {
Seat *s;
@@ -47,7 +51,7 @@ Seat *seat_new(Manager *m, const char *id) {
return NULL;
}
- s->id = file_name_from_path(s->state_file);
+ s->id = path_get_file_name(s->state_file);
s->manager = m;
if (hashmap_put(m->seats, s->id, s) < 0) {
@@ -63,7 +67,7 @@ void seat_free(Seat *s) {
assert(s);
if (s->in_gc_queue)
- LIST_REMOVE(Seat, gc_queue, s->manager->seat_gc_queue, s);
+ LIST_REMOVE(gc_queue, s->manager->seat_gc_queue, s);
while (s->sessions)
session_free(s->sessions);
@@ -80,16 +84,16 @@ void seat_free(Seat *s) {
}
int seat_save(Seat *s) {
+ _cleanup_free_ char *temp_path = NULL;
+ _cleanup_fclose_ FILE *f = NULL;
int r;
- FILE *f;
- char *temp_path;
assert(s);
if (!s->started)
return 0;
- r = safe_mkdir("/run/systemd/seats", 0755, 0, 0);
+ r = mkdir_safe_label("/run/systemd/seats", 0755, 0, 0);
if (r < 0)
goto finish;
@@ -101,8 +105,14 @@ int seat_save(Seat *s) {
fprintf(f,
"# This is private data. Do not parse.\n"
- "IS_VTCONSOLE=%i\n",
- seat_is_vtconsole(s));
+ "IS_SEAT0=%i\n"
+ "CAN_MULTI_SESSION=%i\n"
+ "CAN_TTY=%i\n"
+ "CAN_GRAPHICAL=%i\n",
+ seat_is_seat0(s),
+ seat_can_multi_session(s),
+ seat_can_tty(s),
+ seat_can_graphical(s));
if (s->active) {
assert(s->active->user);
@@ -141,9 +151,6 @@ int seat_save(Seat *s) {
unlink(temp_path);
}
- fclose(f);
- free(temp_path);
-
finish:
if (r < 0)
log_error("Failed to save seat data for %s: %s", s->id, strerror(-r));
@@ -160,8 +167,8 @@ int seat_load(Seat *s) {
}
static int vt_allocate(int vtnr) {
- int fd, r;
- char *p;
+ _cleanup_free_ char *p = NULL;
+ _cleanup_close_ int fd = -1;
assert(vtnr >= 1);
@@ -169,14 +176,10 @@ static int vt_allocate(int vtnr) {
return -ENOMEM;
fd = open_terminal(p, O_RDWR|O_NOCTTY|O_CLOEXEC);
- free(p);
-
- r = fd < 0 ? -errno : 0;
-
- if (fd >= 0)
- close_nointr_nofail(fd);
+ if (fd < 0)
+ return -errno;
- return r;
+ return 0;
}
int seat_preallocate_vts(Seat *s) {
@@ -191,7 +194,7 @@ int seat_preallocate_vts(Seat *s) {
if (s->manager->n_autovts <= 0)
return 0;
- if (!seat_is_vtconsole(s))
+ if (!seat_has_vts(s))
return 0;
for (i = 1; i <= s->manager->n_autovts; i++) {
@@ -236,13 +239,20 @@ int seat_set_active(Seat *s, Session *session) {
old_active = s->active;
s->active = session;
+ if (old_active) {
+ session_device_pause_all(old_active);
+ session_send_changed(old_active, "Active", NULL);
+ }
+
seat_apply_acls(s, old_active);
- if (session && session->started)
- session_send_changed(session, "Active\0");
+ if (session && session->started) {
+ session_send_changed(session, "Active", NULL);
+ session_device_resume_all(session);
+ }
if (!session || session->started)
- seat_send_changed(s, "ActiveSession\0");
+ seat_send_changed(s, "ActiveSession", NULL);
seat_save(s);
@@ -253,7 +263,8 @@ int seat_set_active(Seat *s, Session *session) {
if (old_active) {
session_save(old_active);
- user_save(old_active->user);
+ if (!session || session->user != old_active->user)
+ user_save(old_active->user);
}
return 0;
@@ -266,7 +277,7 @@ int seat_active_vt_changed(Seat *s, int vtnr) {
assert(s);
assert(vtnr >= 1);
- if (!seat_is_vtconsole(s))
+ if (!seat_has_vts(s))
return -EINVAL;
log_debug("VT changed to %i", vtnr);
@@ -290,7 +301,7 @@ int seat_read_active_vt(Seat *s) {
assert(s);
- if (!seat_is_vtconsole(s))
+ if (!seat_has_vts(s))
return 0;
lseek(s->manager->console_active_fd, SEEK_SET, 0);
@@ -329,7 +340,11 @@ int seat_start(Seat *s) {
if (s->started)
return 0;
- log_info("New seat %s.", s->id);
+ log_struct(LOG_INFO,
+ MESSAGE_ID(SD_MESSAGE_SEAT_START),
+ "SEAT_ID=%s", s->id,
+ "MESSAGE=New seat %s.", s->id,
+ NULL);
/* Initialize VT magic stuff */
seat_preallocate_vts(s);
@@ -353,7 +368,11 @@ int seat_stop(Seat *s) {
assert(s);
if (s->started)
- log_info("Removed seat %s.", s->id);
+ log_struct(LOG_INFO,
+ MESSAGE_ID(SD_MESSAGE_SEAT_STOP),
+ "SEAT_ID=%s", s->id,
+ "MESSAGE=Removed seat %s.", s->id,
+ NULL);
seat_stop_sessions(s);
@@ -388,26 +407,69 @@ int seat_attach_session(Seat *s, Session *session) {
assert(session);
assert(!session->seat);
- if (!seat_is_vtconsole(s) && s->sessions)
- return -EEXIST;
-
session->seat = s;
- LIST_PREPEND(Session, sessions_by_seat, s->sessions, session);
+ LIST_PREPEND(sessions_by_seat, s->sessions, session);
- seat_send_changed(s, "Sessions\0");
+ seat_send_changed(s, "Sessions", NULL);
- if (!seat_is_vtconsole(s)) {
- assert(!s->active);
+ /* On seats with VTs, the VT logic defines which session is active. On
+ * seats without VTs, we automatically activate new sessions. */
+ if (!seat_has_vts(s))
seat_set_active(s, session);
- }
return 0;
}
-bool seat_is_vtconsole(Seat *s) {
+void seat_complete_switch(Seat *s) {
+ Session *session;
+
+ assert(s);
+
+ /* if no session-switch is pending or if it got canceled, do nothing */
+ if (!s->pending_switch)
+ return;
+
+ session = s->pending_switch;
+ s->pending_switch = NULL;
+
+ seat_set_active(s, session);
+}
+
+bool seat_has_vts(Seat *s) {
+ assert(s);
+
+ return seat_is_seat0(s) && s->manager->console_active_fd >= 0;
+}
+
+bool seat_is_seat0(Seat *s) {
+ assert(s);
+
+ return s->manager->seat0 == s;
+}
+
+bool seat_can_multi_session(Seat *s) {
+ assert(s);
+
+ return seat_has_vts(s);
+}
+
+bool seat_can_tty(Seat *s) {
assert(s);
- return s->manager->vtconsole == s;
+ return seat_has_vts(s);
+}
+
+bool seat_has_master_device(Seat *s) {
+ assert(s);
+
+ /* device list is ordered by "master" flag */
+ return !!s->devices && s->devices->master;
+}
+
+bool seat_can_graphical(Seat *s) {
+ assert(s);
+
+ return seat_has_master_device(s);
}
int seat_get_idle_hint(Seat *s, dual_timestamp *t) {
@@ -427,7 +489,7 @@ int seat_get_idle_hint(Seat *s, dual_timestamp *t) {
if (!ih) {
if (!idle_hint) {
- if (k.monotonic < ts.monotonic)
+ if (k.monotonic > ts.monotonic)
ts = k;
} else {
idle_hint = false;
@@ -446,16 +508,16 @@ int seat_get_idle_hint(Seat *s, dual_timestamp *t) {
return idle_hint;
}
-int seat_check_gc(Seat *s, bool drop_not_started) {
+bool seat_check_gc(Seat *s, bool drop_not_started) {
assert(s);
if (drop_not_started && !s->started)
- return 0;
+ return false;
- if (seat_is_vtconsole(s))
- return 1;
+ if (seat_is_seat0(s))
+ return true;
- return !!s->devices;
+ return seat_has_master_device(s);
}
void seat_add_to_gc_queue(Seat *s) {
@@ -464,7 +526,7 @@ void seat_add_to_gc_queue(Seat *s) {
if (s->in_gc_queue)
return;
- LIST_PREPEND(Seat, gc_queue, s->manager->seat_gc_queue, s);
+ LIST_PREPEND(gc_queue, s->manager->seat_gc_queue, s);
s->in_gc_queue = true;
}