summaryrefslogtreecommitdiff
path: root/introspection
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-05-30 16:43:39 +0200
committerThomas Haller <thaller@redhat.com>2016-06-01 19:06:34 +0200
commit0acee9722072c99b552d6030f88d307a0acaea79 (patch)
treec90bc00848c69d12618249f28b44b829469b94a0 /introspection
parent1d0e0eeffd92f53d6682cd8f4b3e1ba90997e4c5 (diff)
downloadNetworkManager-0acee9722072c99b552d6030f88d307a0acaea79.tar.gz
config,dns: support Reload flags to specify that only parts should be reloaded
Support 3 new flags for Reload: - 0x01 (CONF): reload the configuration from disk - 0x02 (DNS_RC): write DNS configuration to resolv.conf - 0x04 (DNS_FULL): restart DNS plugin Omitting all flags is the same as reloading everything, thus SIGHUP.
Diffstat (limited to 'introspection')
-rw-r--r--introspection/nm-manager.xml23
1 files changed, 21 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"/>