fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-08 04:50:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: make monitor-connection-files be false by default

Browse source
This commit is contained in:
Dan Winship 2013-07-09 13:07:20 -04:00
parent 5f0f4b83b1
commit 328dea9c5c
3 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
data/server.conf.in
View file

@ -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)

7
man/NetworkManager.conf.xml
View file

@ -101,10 +101,11 @@ Copyright (C) 2010 - 2013 Red Hat, Inc.
<listitem><para>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
'<literal>false</literal>', 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.</para></listitem>
via the ReloadConnections D-Bus call. If this key is set to
'<literal>true</literal>', then NetworkManager wil reload
connection files any time they changed.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>dhcp</varname></term>

2
src/config/nm-config.c
View file

@ -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);