X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-seat.c;h=49808c928b0db389126e7365206ae18a0c6a6936;hb=6e27b4609e949a4fb72c409d50440a6ff63598d5;hp=709c6385e679c835258fbb705b8041ce310ce1fb;hpb=e2cc6eca73cd1df8be552d7c23f9ff3d69c06f1e;p=elogind.git
diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index 709c6385e..49808c928 100644
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -19,21 +19,16 @@
along with systemd; If not, see .
***/
-#include
#include
#include
#include
-#include
-#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;
@@ -154,7 +149,7 @@ int seat_save(Seat *s) {
finish:
if (r < 0)
- log_error("Failed to save seat data %s: %s", s->state_file, strerror(-r));
+ log_error_errno(r, "Failed to save seat data %s: %m", s->state_file);
return r;
}
@@ -201,7 +196,7 @@ int seat_preallocate_vts(Seat *s) {
q = vt_allocate(i);
if (q < 0) {
- log_error("Failed to preallocate VT %i: %s", i, strerror(-q));
+ log_error_errno(q, "Failed to preallocate VT %u: %m", i);
r = q;
}
}
@@ -221,7 +216,7 @@ int seat_apply_acls(Seat *s, Session *old_active) {
!!s->active, s->active ? s->active->user->uid : 0);
if (r < 0)
- log_error("Failed to apply ACLs: %s", strerror(-r));
+ log_error_errno(r, "Failed to apply ACLs: %m");
return r;
}
@@ -340,12 +335,24 @@ int seat_active_vt_changed(Seat *s, unsigned int vtnr) {
log_debug("VT changed to %u", vtnr);
+ /* we might have earlier closing sessions on the same VT, so try to
+ * find a running one first */
LIST_FOREACH(sessions_by_seat, i, s->sessions)
- if (i->vtnr == vtnr) {
+ if (i->vtnr == vtnr && !i->stopping) {
new_active = i;
break;
}
+ if (!new_active) {
+ /* no running one? then we can't decide which one is the
+ * active one, let the first one win */
+ LIST_FOREACH(sessions_by_seat, i, s->sessions)
+ if (i->vtnr == vtnr) {
+ new_active = i;
+ break;
+ }
+ }
+
r = seat_set_active(s, new_active);
manager_spawn_autovt(s->manager, vtnr);