summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2013-06-14 13:26:28 -0400
committerColin Walters <walters@verbum.org>2013-06-24 12:25:49 -0400
commit4ff7eeeaae101bd415b8cb318a5b536ecdaebba9 (patch)
tree2536bd3a40c7231a10e4636780b508a211f37195 /src/main.c
parent12955fcda60607971bc6344ecc2abbeae75560f1 (diff)
downloadNetworkManager-4ff7eeeaae101bd415b8cb318a5b536ecdaebba9.tar.gz
main: setenv(GIO_USE_VFS=local) *very* early
See https://bugzilla.gnome.org/show_bug.cgi?id=701322 for why we should order calls to setenv() as early as possible.
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main.c b/src/main.c
index 67be160b4f..dcfdae352a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -333,6 +333,12 @@ main (int argc, char *argv[])
{NULL}
};
+ /* Make GIO ignore the remote VFS service; otherwise it tries to use the
+ * session bus to contact the remote service, and NM shouldn't ever be
+ * talking on the session bus. See rh #588745
+ */
+ setenv ("GIO_USE_VFS", "local", 1);
+
if (!g_module_supported ()) {
fprintf (stderr, _("GModules are not supported on your platform!\n"));
exit (1);
@@ -398,12 +404,6 @@ main (int argc, char *argv[])
g_free (path);
}
- /* Make GIO ignore the remote VFS service; otherwise it tries to use the
- * session bus to contact the remote service, and NM shouldn't ever be
- * talking on the session bus. See rh #588745
- */
- setenv ("GIO_USE_VFS", "local", 1);
-
/* Setup runtime directory */
if (g_mkdir_with_parents (NMRUNDIR, 0755) != 0) {
nm_log_err (LOGD_CORE, "Cannot create '%s': %s", NMRUNDIR, strerror (errno));