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=ead649820018bf76d78c617203eb5df922582c77;hp=8eb5e3ee0a58d72d4f261fb3798a424c8144621c;hb=16e56d9f1ae28f17cf360a6daaab668b6cd66e61;hpb=da927ba997d68401563b927f92e6e40e021a8e5c
diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index 8eb5e3ee0..ead649820 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;
@@ -181,34 +176,6 @@ static int vt_allocate(unsigned int vtnr) {
return 0;
}
-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_has_vts(s))
- return 0;
-
- for (i = 1; i <= s->manager->n_autovts; i++) {
- int q;
-
- q = vt_allocate(i);
- if (q < 0) {
- log_error_errno(q, "Failed to preallocate VT %i: %m", i);
- r = q;
- }
- }
-
- return r;
-}
-
int seat_apply_acls(Seat *s, Session *old_active) {
int r;
@@ -340,14 +307,25 @@ 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);
return r;
}
@@ -405,9 +383,6 @@ int seat_start(Seat *s) {
LOG_MESSAGE("New seat %s.", s->id),
NULL);
- /* Initialize VT magic stuff */
- seat_preallocate_vts(s);
-
/* Read current VT */
seat_read_active_vt(s);