diff options
| author | Daniel Drake <drake@endlessm.com> | 2017-01-02 10:34:15 -0600 |
|---|---|---|
| committer | Mario Sanchez Prada <mario@endlessm.com> | 2017-04-03 12:55:18 +0200 |
| commit | 67ef79c125c34b66072ae00927b2c89f2c98f196 (patch) | |
| tree | 3239ff0857c338b04218fb800b2972a38efd3a6b /daemon/gdm-launch-environment.c | |
| parent | eb498b5d7cbebd426ac3df2dc8bced9888a46227 (diff) | |
| download | gdm-67ef79c125c34b66072ae00927b2c89f2c98f196.tar.gz | |
launch-environment: Don't set DCONF_PROFILE for gnome-initial-setup
The locked down dconf profile should not be used for the initial setup
session. This allows overridden values from the user profile to take
effect.
Diffstat (limited to 'daemon/gdm-launch-environment.c')
| -rw-r--r-- | daemon/gdm-launch-environment.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/daemon/gdm-launch-environment.c b/daemon/gdm-launch-environment.c index a7ae6728..5fd346ff 100644 --- a/daemon/gdm-launch-environment.c +++ b/daemon/gdm-launch-environment.c @@ -159,11 +159,16 @@ build_launch_environment (GdmLaunchEnvironment *launch_environment, if (launch_environment->priv->session_mode != NULL) { g_hash_table_insert (hash, g_strdup ("GNOME_SHELL_SESSION_MODE"), g_strdup (launch_environment->priv->session_mode)); - /* Inital setup needs gvfs for fetching remote avatars. */ if (strcmp (launch_environment->priv->session_mode, INITIAL_SETUP_SESSION_MODE) != 0) { + /* gvfs is needed for fetching remote avatars in the initial setup. Disable it otherwise. */ g_hash_table_insert (hash, g_strdup ("GVFS_DISABLE_FUSE"), g_strdup ("1")); g_hash_table_insert (hash, g_strdup ("GIO_USE_VFS"), g_strdup ("local")); g_hash_table_insert (hash, g_strdup ("GVFS_REMOTE_VOLUME_MONITOR_IGNORE"), g_strdup ("1")); + + /* The locked down dconf profile should not be used for the initial setup session. + * This allows overridden values from the user profile to take effect. + */ + g_hash_table_insert (hash, g_strdup ("DCONF_PROFILE"), g_strdup ("gdm")); } } @@ -199,7 +204,6 @@ build_launch_environment (GdmLaunchEnvironment *launch_environment, g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (g_getenv ("PATH"))); g_hash_table_insert (hash, g_strdup ("RUNNING_UNDER_GDM"), g_strdup ("true")); - g_hash_table_insert (hash, g_strdup ("DCONF_PROFILE"), g_strdup ("gdm")); return hash; } |