[gdm/wip/wayland-for-merge: 3/17] server: Move /Init script processing here

[Jasper St. Pierre <jstpierre src gnome org>]

commit e5d4c1b65c0b23574f3c4dacd3052b4c3674bd69
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Thu Mar 6 15:00:38 2014 -0500

    server: Move /Init script processing here
    
    We still need to have it in the XDMCP chooser slave, since we need to
    initialize the X server, even if we didn't start it ourselves.

 daemon/gdm-server.c       |    5 +++++
 daemon/gdm-simple-slave.c |    8 +-------
 2 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
index fe012a2..01436e6 100644
--- a/daemon/gdm-server.c
+++ b/daemon/gdm-server.c
@@ -848,6 +848,11 @@ gdm_server_start (GdmServer *server)
                 goto out;
         }
 
+        gdm_run_script (GDMCONFDIR "/Init", GDM_USERNAME,
+                        server->priv->display_name,
+                        NULL, /* hostname */
+                        server->priv->auth_file);
+
         res = TRUE;
  out:
         if (local_error) {
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index 7d46a5d..f9ecc33 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -1247,9 +1247,6 @@ start_launch_environment (GdmSimpleSlave *slave,
                 alarm (slave->priv->ping_interval);
         }
 
-        /* Run the init script. gdmslave suspends until script has terminated */
-        run_script (slave, GDMCONFDIR "/Init", GDM_USERNAME);
-
         g_debug ("GdmSimpleSlave: Creating greeter on %s %s %s", display_name, display_device, 
display_hostname);
         slave->priv->greeter_environment = create_environment (session_id,
                                                                username,
@@ -1357,10 +1354,7 @@ setup_session (GdmSimpleSlave *slave)
 {
         if (wants_initial_setup (slave)) {
                 start_initial_setup (slave);
-        } else if (wants_autologin (slave)) {
-                /* Run the init script. gdmslave suspends until script has terminated */
-                run_script (slave, GDMCONFDIR "/Init", GDM_USERNAME);
-        } else {
+        } else if (!wants_autologin (slave)) {
                 start_greeter (slave);
         }
         create_new_session (slave);