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.

2 files changed, 7 insertions, 7 deletions

diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
index 4363e457..d4ee8530 100644
--- a/daemon/gdm-server.c
+++ b/daemon/gdm-server.c
@@ -183,6 +183,12 @@ static void
 gdm_server_ready (GdmServer *server)
 {
         g_debug ("GdmServer: Got USR1 from X server - emitting READY");
+
+        gdm_run_script (GDMCONFDIR "/Init", GDM_USERNAME,
+                        server->priv->display_name,
+                        NULL, /* hostname */
+                        server->priv->auth_file);
+
         g_signal_emit (server, signals[READY], 0);
 }
 
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index 214e1a47..f06ef798 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -1249,9 +1249,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,
@@ -1359,10 +1356,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);