diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-06-05 15:57:30 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-06-05 16:04:27 +0200 |
| commit | ce2ea51ed0a068cbeb023955cac44405c0345941 (patch) | |
| tree | 03978c5c8c96d9610b009893dcac67aa2af437d4 | |
| parent | 18ecf48d7a9d03194db1b65ef46e386284426f89 (diff) | |
| download | NetworkManager-ce2ea51ed0a068cbeb023955cac44405c0345941.tar.gz | |
Revert "core: avoid loading GIO modules"
This reverts commit 6a841c0cd1532f6e2e04c2fbb674ee3f69c714b7.
We do actually need the modules for connectivity checking.
| -rw-r--r-- | include/nm-test-utils.h | 5 | ||||
| -rw-r--r-- | src/main-utils.c | 3 |
2 files changed, 0 insertions, 8 deletions
diff --git a/include/nm-test-utils.h b/include/nm-test-utils.h index c14d6eca02..d666366098 100644 --- a/include/nm-test-utils.h +++ b/include/nm-test-utils.h @@ -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) */ nm_utils_get_monotonic_timestamp_s (); #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__ diff --git a/src/main-utils.c b/src/main-utils.c index 6e649e7fbb..5378ca97a1 100644 --- a/src/main-utils.c +++ b/src/main-utils.c @@ -205,9 +205,6 @@ nm_main_utils_early_setup (const char *progname, * talking on the session bus. See rh #588745 */ 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. |