diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-06-01 12:09:21 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-06-01 13:13:13 +0200 |
| commit | e584c891f8e083edeffd94ef135a73569fdeca0c (patch) | |
| tree | c90bc00848c69d12618249f28b44b829469b94a0 | |
| parent | dfd4ff61b34b168fa4a20b5ea78c8d47720bf375 (diff) | |
| download | NetworkManager-e584c891f8e083edeffd94ef135a73569fdeca0c.tar.gz | |
fixup! config,dns: support Reload flags to specify that only parts should be reloaded
| -rw-r--r-- | introspection/nm-manager.xml | 23 | ||||
| -rw-r--r-- | man/NetworkManager.conf.xml | 4 |
2 files changed, 25 insertions, 2 deletions
diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml index ba898a78c8..ea368ba331 100644 --- a/introspection/nm-manager.xml +++ b/introspection/nm-manager.xml @@ -5,8 +5,27 @@ <!-- Reload: - @flags: optional flags to specify which parts shall be reloaded. A default of zero - means to reload everything. + @flags: optional flags to specify which parts shall be reloaded. + + Reload NetworkManager's configuration and perform certain updates, like flushing a cache or + rewriting external state to disk. This is similar to sending SIGHUP to NetworkManager but it + allows for more fine-grained control over what to reload (see @flags). It also allows + non-root access via PolicyKit and contrary to signals it is synchronous. + + No flags (0x00) means to reload everything that is supported which is identical to + sending a SIGHUP. + (0x01) means to reload the NetworkManager.conf configuration from disk. Note that this + does not include connections, which can be reloaded via Setting's ReloadConnections. + (0x02) means to update DNS configuration, which usually involves writing /etc/resolv.conf + anew. + (0x04) means to restart the DNS plugin. This is for example useful when using + dnsmasq plugin, which uses additional configuration in /etc/NetworkManager/dnsmasq.d. + If you edit those files, you can restart the DNS plugin. This action shortly interrupts + rename resolution. + Note that flags may affect each other. For example, restarting the DNS plugin (0x04) + implicitly updates DNS too (0x02). Or when reloading the configuration (0x01), changes + to DNS setting also cause a DNS update (0x02). However, (0x01) does not involve restarting + the DNS plugin (0x02), unless an entirely different plugin is selected. --> <method name="Reload"> <arg name="flags" type="u" direction="in"/> diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index fd6d7cef59..23038dbbc1 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -78,6 +78,10 @@ This file is not intended to be modified by the user, but it is read last and can shadow user configuration from <literal>NetworkManager.conf</literal>. </para> + <para> + Certain settings from the configuration can be reloaded at runtime either by sending SIGHUP signal or via + D-Bus' Reload call. + </para> </refsect1> |