summaryrefslogtreecommitdiff
path: root/daemon
diff options
context:
space:
mode:
authorBrian Cameron <Brian.Cameron@sun.com>2010-04-21 17:03:07 -0500
committerBrian Cameron <Brian.Cameron@sun.com>2010-04-21 17:03:07 -0500
commita9d7f04e02df0fb227ebc57e68e9bd75a210fb95 (patch)
tree2881a962ab25b93e40909aae320a25e9f467e7e7 /daemon
parent88dad5824cd5b24f9856c3f8efba6a0b819d29d6 (diff)
downloadgdm-a9d7f04e02df0fb227ebc57e68e9bd75a210fb95.tar.gz
Ensure Init script is called before starting autologin (fixes bug #614488).
Diffstat (limited to 'daemon')
-rw-r--r--daemon/gdm-simple-slave.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index 59e3530d..2910366c 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -1062,6 +1062,8 @@ idle_connect_to_display (GdmSimpleSlave *slave)
start_greeter (slave);
create_new_session (slave);
} else {
+ /* Run the init script. gdmslave suspends until script has terminated */
+ gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init", GDM_USERNAME);
reset_session (slave);
}
} else {