[gdm] server: fix non-systemd code path



commit 9c727fb7553250b46fe368163bab5156c016bed7
Author: Ray Strode <rstrode redhat com>
Date:   Mon Aug 27 14:58:04 2012 -0400

    server: fix non-systemd code path
    
    I incorrectly used g_strcmp0 in commit
    
    42ef43e603d65390c2c86e276489c8a08c7808a0
    
    breaking consolekit users.
    
    This commit rectifies that.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=511168

 daemon/gdm-server.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
index 673c401..a0e62b0 100644
--- a/daemon/gdm-server.c
+++ b/daemon/gdm-server.c
@@ -774,9 +774,17 @@ gdm_server_start (GdmServer *server)
         const char *vtarg = NULL;
 
         /* Hardcode the VT for the initial X server, but nothing else */
-        if (server->priv->is_initial
-            && g_strcmp0 (server->priv->display_seat_id, "seat0") == 0) {
+        if (server->priv->is_initial) {
                 vtarg = "vt" GDM_INITIAL_VT;
+
+#ifdef WITH_SYSTEMD
+                /* undo the hardcoding if we are an auxillary seat */
+                if (sd_booted () > 0) {
+                     if (strcmp (server->priv->display_seat_id, "seat0") != 0) {
+                         vtarg = NULL;
+                     }
+                }
+#endif
         }
 
         /* fork X server process */



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]