[gdm/wip/wayland-at-login-screen: 60/70] worker: force vt 1 for initial display

[Ray Strode <halfline src gnome org>]

commit ca882203daaaf442c1d0cb84027805312d7e9055
Author: Ray Strode <rstrode redhat com>
Date:   Mon Feb 16 20:31:33 2015 -0500

    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.

 daemon/gdm-session-worker.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
index 4c6ac2e..783801f 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;