diff options
author | Michael Catanzaro <mcatanzaro@igalia.com> | 2015-12-27 22:16:35 -0600 |
---|---|---|
committer | Michael Catanzaro <mcatanzaro@igalia.com> | 2016-01-05 15:52:10 -0600 |
commit | 5e81151a1479b87bd91b435b9ee209fd16a47d27 (patch) | |
tree | 942cac7a8eb8eb0af21b9045ba99e2e3346028d6 | |
parent | 0113cecae244352f1797f59862ef79cde34ce3c8 (diff) | |
download | gdm-5e81151a1479b87bd91b435b9ee209fd16a47d27.tar.gz |
launch-environment: disable gvfs except in initial setup mode
gnome-initial-setup needs gvfs for remote avatar lookup. The greeter
does not.
https://bugzilla.gnome.org/show_bug.cgi?id=725584
-rw-r--r-- | daemon/gdm-launch-environment.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/daemon/gdm-launch-environment.c b/daemon/gdm-launch-environment.c index 2f16cbd9..89455f63 100644 --- a/daemon/gdm-launch-environment.c +++ b/daemon/gdm-launch-environment.c @@ -158,6 +158,13 @@ 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)) { + 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")); + } + g_hash_table_insert (hash, g_strdup ("LOGNAME"), g_strdup (launch_environment->priv->user_name)); g_hash_table_insert (hash, g_strdup ("USER"), g_strdup (launch_environment->priv->user_name)); g_hash_table_insert (hash, g_strdup ("USERNAME"), g_strdup (launch_environment->priv->user_name)); |