From 328dea9c5c3aa5c7added3df2dbff78a7139b250 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 9 Jul 2013 13:07:20 -0400 Subject: [PATCH] core: make monitor-connection-files be false by default --- data/server.conf.in | 9 --------- man/NetworkManager.conf.xml | 7 ++++--- src/config/nm-config.c | 2 +- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/data/server.conf.in b/data/server.conf.in index 031fbebcdc..757636389b 100644 --- a/data/server.conf.in +++ b/data/server.conf.in @@ -4,15 +4,6 @@ [main] -# Normally, NetworkManager reloads connection files on disk any time -# they are changed. Setting "monitor-connection-files=false" will -# disable this behavior, and NetworkManager will then only read -# connection files at startup, and when explicitly requested via -# D-Bus. - -#monitor-connection-files=false - - # Normally, if there is an ethernet device that is not matched by any # existing configured connection, NetworkManager will create a # "default" connection for that device, using automatic (DHCP/SLAAC) diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index a56ea598e3..fa87a0c593 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -101,10 +101,11 @@ Copyright (C) 2010 - 2013 Red Hat, Inc. Whether the configured settings plugin(s) should set up file monitors and immediately pick up changes made to connection files while NetworkManager is running. This - is enabled by default; if this key is set to - 'false', then NetworkManager will only read + is disabled by default; NetworkManager will only read the connection files at startup, and when explicitly requested - via the ReloadConnections D-Bus call. + via the ReloadConnections D-Bus call. If this key is set to + 'true', then NetworkManager wil reload + connection files any time they changed. dhcp diff --git a/src/config/nm-config.c b/src/config/nm-config.c index 409352b49a..19692fc339 100644 --- a/src/config/nm-config.c +++ b/src/config/nm-config.c @@ -511,7 +511,7 @@ nm_config_new (GError **error) } g_free (value); } else - priv->monitor_connection_files = TRUE; + priv->monitor_connection_files = FALSE; priv->dhcp_client = g_key_file_get_value (priv->keyfile, "main", "dhcp", NULL); priv->dns_mode = g_key_file_get_value (priv->keyfile, "main", "dns", NULL);