logind: fix session_activate(vtnr = 0)

[elogind.git] / src / login / logind-session.c

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index fe5fa27be11b161c4103cc2dcf201e8111c4757b..ab1c79cfa226557493325f2ae1c553472e1e8aa8 100644 (file)
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -360,12 +360,10 @@ int session_load(Session *s) {
 }
 
 int session_activate(Session *s) {
-        int r;
-
         assert(s);
         assert(s->user);
 
-        if (s->vtnr < 0)
+        if (s->vtnr <= 0)
                 return -ENOTSUP;
 
         if (!s->seat)
@@ -374,13 +372,9 @@ int session_activate(Session *s) {
         if (s->seat->active == s)
                 return 0;
 
-        assert(seat_is_vtconsole(s->seat));
-
-        r = chvt(s->vtnr);
-        if (r < 0)
-                return r;
+        assert(seat_is_seat0(s->seat));
 
-        return seat_set_active(s->seat, s);
+        return chvt(s->vtnr);
 }
 
 static int session_link_x11_socket(Session *s) {