diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2012-09-22 15:43:55 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2012-09-25 13:57:35 -0400 |
| commit | eda8eede28cbadfb4d1c2a6c09ad06da26c1d8f9 (patch) | |
| tree | 5bddc95bb9ad74b6182f1dac236d978949622dd6 /daemon/gdm-simple-slave.c | |
| parent | c2b5e4348b5e96644edeb8b4483965220a6dc230 (diff) | |
| download | gdm-eda8eede28cbadfb4d1c2a6c09ad06da26c1d8f9.tar.gz | |
Don't run gnome-session in failsafe mode
Explicitly pass /usr/share/gdm/greeter/autostart
as autostart dir, and don't run gnome-session in failsafe
mode, so it can autostart applications from that directory.
https://bugzilla.gnome.org/show_bug.cgi?id=684474
Diffstat (limited to 'daemon/gdm-simple-slave.c')
| -rw-r--r-- | daemon/gdm-simple-slave.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c index 632153b1..91515ad7 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c @@ -982,7 +982,10 @@ create_environment (const char *session_id, gdm_settings_direct_get_boolean (GDM_KEY_DEBUG, &debug); args = g_ptr_array_new (); - g_ptr_array_add (args, BINDIR "/gnome-session -f"); + g_ptr_array_add (args, BINDIR "/gnome-session"); + + g_ptr_array_add (args, "--autostart"); + g_ptr_array_add (args, DATADIR "/gdm/greeter/autostart"); if (debug) { g_ptr_array_add (args, "--debug"); |