summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2017-09-20 12:02:38 -0400
committerRay Strode <rstrode@redhat.com>2017-09-20 16:04:53 -0400
commit85d23a4d51fc6690fbd7775f459fd46a8ea796f8 (patch)
tree667ffe29998a8c3bab8792f2843aaba5a2ab725f
parent76df24176c1210e781a7bb5f4b70018e356b749b (diff)
downloadgdm-85d23a4d51fc6690fbd7775f459fd46a8ea796f8.tar.gz
session-worker: only jump to VT on seat0
seat0 is the only seat that supports VTs, so don't ever try to change VTs if not on seat0. https://bugzilla.gnome.org/show_bug.cgi?id=787943
-rw-r--r--daemon/gdm-session-worker.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
index c4d21ec8..543006ba 100644
--- a/daemon/gdm-session-worker.c
+++ b/daemon/gdm-session-worker.c
@@ -909,8 +909,10 @@ gdm_session_worker_uninitialize_pam (GdmSessionWorker *worker,
gdm_session_worker_stop_auditor (worker);
- if (worker->priv->login_vt != worker->priv->session_vt) {
- jump_to_vt (worker, worker->priv->login_vt);
+ if (g_strcmp0 (worker->priv->display_seat_id, "seat0") == 0) {
+ if (worker->priv->login_vt != worker->priv->session_vt) {
+ jump_to_vt (worker, worker->priv->login_vt);
+ }
}
worker->priv->login_vt = 0;
@@ -1852,8 +1854,10 @@ gdm_session_worker_start_session (GdmSessionWorker *worker,
/* If we're in new vt mode, jump to the new vt now. There's no need to jump for
* the other two modes: in the logind case, the session will activate itself when
* ready, and in the reuse server case, we're already on the correct VT. */
- if (worker->priv->display_mode == GDM_SESSION_DISPLAY_MODE_NEW_VT) {
- jump_to_vt (worker, worker->priv->session_vt);
+ if (g_strcmp0 (worker->priv->display_seat_id, "seat0") == 0) {
+ if (worker->priv->display_mode == GDM_SESSION_DISPLAY_MODE_NEW_VT) {
+ jump_to_vt (worker, worker->priv->session_vt);
+ }
}
if (!worker->priv->is_program_session && !run_script (worker, GDMCONFDIR "/PostLogin")) {