X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-seat.c;h=6e6e78af4a9a864f9b92070bc1b97bdbccf2961c;hb=edda707302d7c5138291c0ff4e9c43db9fba51d8;hp=99921951511cc3c9293c06d0be12fb3669cda899;hpb=154034270c4643b7cfe61c0be1676d78bb1b7b07;p=elogind.git

diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index 999219515..6e6e78af4 100644
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -19,21 +19,18 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <assert.h>
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <sys/ioctl.h>
-#include <linux/vt.h>
 #include <string.h>
 
-#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"
+#include "formats-util.h"
+#include "terminal-util.h"
 
 Seat *seat_new(Manager *m, const char *id) {
         Seat *s;
@@ -154,7 +151,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;
 }
@@ -181,34 +178,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("Failed to preallocate VT %i: %s", i, strerror(-q));
-                        r = q;
-                }
-        }
-
-        return r;
-}
-
 int seat_apply_acls(Seat *s, Session *old_active) {
         int r;
 
@@ -221,7 +190,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,14 +309,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;
 }
@@ -400,14 +380,11 @@ int seat_start(Seat *s) {
                 return 0;
 
         log_struct(LOG_INFO,
-                   MESSAGE_ID(SD_MESSAGE_SEAT_START),
+                   LOG_MESSAGE_ID(SD_MESSAGE_SEAT_START),
                    "SEAT_ID=%s", s->id,
-                   "MESSAGE=New seat %s.", s->id,
+                   LOG_MESSAGE("New seat %s.", s->id),
                    NULL);
 
-        /* Initialize VT magic stuff */
-        seat_preallocate_vts(s);
-
         /* Read current VT */
         seat_read_active_vt(s);
 
@@ -428,9 +405,9 @@ int seat_stop(Seat *s, bool force) {
 
         if (s->started)
                 log_struct(LOG_INFO,
-                           MESSAGE_ID(SD_MESSAGE_SEAT_STOP),
+                           LOG_MESSAGE_ID(SD_MESSAGE_SEAT_STOP),
                            "SEAT_ID=%s", s->id,
-                           "MESSAGE=Removed seat %s.", s->id,
+                           LOG_MESSAGE("Removed seat %s.", s->id),
                            NULL);
 
         seat_stop_sessions(s, force);