summaryrefslogtreecommitdiff
path: root/daemon/gdm-session-worker.c
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2015-02-16 20:31:33 -0500
committerRay Strode <rstrode@redhat.com>2015-02-18 17:34:15 -0500
commit22cab0be6e1b1b3a2a60d1ee85bc7f8ca07a6069 (patch)
tree09da142f0fbe88cd5b931d3f42eb03b96af998be /daemon/gdm-session-worker.c
parent7a4e34049c79e907d1a027390c5d3a8dcdc11977 (diff)
downloadgdm-22cab0be6e1b1b3a2a60d1ee85bc7f8ca07a6069.tar.gz
worker: force vt 1 for initial display
If the session is logind managed, then we currently give it the next available VT. VT 1 will never show up as available, though, since it's allocated and in the foreground. This commit makes sure that, if the initial display is logind managed, then it will get put on VT 1. https://bugzilla.gnome.org/show_bug.cgi?id=744764
Diffstat (limited to 'daemon/gdm-session-worker.c')
-rw-r--r--daemon/gdm-session-worker.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
index 4c6ac2e6..783801f3 100644
--- a/daemon/gdm-session-worker.c
+++ b/daemon/gdm-session-worker.c
@@ -2025,9 +2025,13 @@ set_up_for_new_vt (GdmSessionWorker *worker)
goto fail;
}
- if (ioctl(fd, VT_OPENQRY, &session_vt) < 0) {
- g_debug ("GdmSessionWorker: couldn't open new VT: %m");
- goto fail;
+ if (worker->priv->display_is_initial) {
+ session_vt = atoi (GDM_INITIAL_VT);
+ } else {
+ if (ioctl(fd, VT_OPENQRY, &session_vt) < 0) {
+ g_debug ("GdmSessionWorker: couldn't open new VT: %m");
+ goto fail;
+ }
}
worker->priv->login_vt = vt_state.v_active;