colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "core: avoid loading GIO modules"

Browse Source 
This reverts commit 6a841c0cd1.

We do actually need the modules for connectivity checking.
This commit is contained in:
Lubomir Rintel
2015-06-05 15:57:30 +02:00
parent 18ecf48d7a
commit ce2ea51ed0
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/nm-test-utils.h
View File

@@ -439,11 +439,6 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_
/* ensure that monotonic timestamp is called (because it initially logs a line) */ /* ensure that monotonic timestamp is called (because it initially logs a line) */
nm_utils_get_monotonic_timestamp_s (); nm_utils_get_monotonic_timestamp_s ();
#endif #endif
/* Avoid loading the VFS modules we don't use in the daemon.
* See: src/main-utils.c:nm_main_utils_early_setup() */
setenv ("GIO_USE_VFS", "local", 1);
setenv ("GIO_MODULE_DIR", "", 1);
} }
#ifdef __NETWORKMANAGER_LOGGING_H__ #ifdef __NETWORKMANAGER_LOGGING_H__

3
src/main-utils.c
View File

@@ -205,9 +205,6 @@ nm_main_utils_early_setup (const char *progname,
* talking on the session bus. See rh #588745 * talking on the session bus. See rh #588745
*/ */
setenv ("GIO_USE_VFS", "local", 1); setenv ("GIO_USE_VFS", "local", 1);
/* Don't load GIO modules. We just want to load plain files and the
* modules would just take extra memory. */
setenv ("GIO_MODULE_DIR", "", 1);
/* /*
* Set the umask to 0022, which results in 0666 & ~0022 = 0644. * Set the umask to 0022, which results in 0666 & ~0022 = 0644.