From 2e5fa45ddfbb5cffa1e78221f1cea706e2f298af Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 31 Jul 2019 10:51:42 +0200 Subject: New upstream version 1.19.90 --- man/NetworkManager.conf.xml | 45 +++++++-------------------------------------- 1 file changed, 7 insertions(+), 38 deletions(-) (limited to 'man/NetworkManager.conf.xml') diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 28934247..e56de210 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -153,29 +153,7 @@ plugins-=remove-me monitor-connection-files - 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 disabled by default; NetworkManager will only read - the connection files at startup, and when explicitly requested - via the ReloadConnections D-Bus call. If this key is set to - 'true', then NetworkManager will reload - connection files any time they changed. - Automatic reloading is not advised because there are race conditions - involved and it depends on the way how the editor updates the file. - In some situations, NetworkManager might first delete and add the - connection anew, instead of updating the existing one. Also, NetworkManager - might pick up incomplete settings while the user is still editing the files. - - Note that neither this setting nor restarting the NetworkManager daemon - is the advised way to reload connection profiles from disk. Instead, after - modifying the files reload them with nmcli connection reload - or nmcli connection load "$FILENAME". Even better, - instead of modifying files directly, use NetworkManager tools like - nmcli, nmtui or the GUI. - - This setting is deprecated and will have no effect in the future. - + This setting is deprecated and has no effect. auth-polkit @@ -328,8 +306,8 @@ no-auto-default=* /etc/resolv.conf to reflect the nameservers provided by currently active connections. dnsmasq: NetworkManager will run - dnsmasq as a local caching nameserver, using a "split DNS" - configuration if you are connected to a VPN, and then update + dnsmasq as a local caching nameserver, using "Conditional Forwarding" + if you are connected to a VPN, and then update resolv.conf to point to the local nameserver. It is possible to pass custom options to the dnsmasq instance by adding them to files in the @@ -343,8 +321,8 @@ no-auto-default=* systemd-resolved: NetworkManager will push the DNS configuration to systemd-resolved unbound: NetworkManager will talk - to unbound and dnssec-triggerd, providing a "split DNS" - configuration with DNSSEC support. /etc/resolv.conf + to unbound and dnssec-triggerd, using "Conditional Forwarding" + with DNSSEC support. /etc/resolv.conf will be managed by dnssec-trigger daemon. none: NetworkManager will not modify resolv.conf. This implies @@ -1345,17 +1323,8 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16 ibft, no-ibft - This plugin allows to read iBFT configuration (iSCSI Boot Firmware Table). - The configuration is read using /sbin/iscsiadm. Users are - expected to configure iBFT connections via the firmware interfaces. - If ibft support is available, it is automatically enabled after - ifcfg-rh. This can be disabled by no-ibft. - You can also explicitly specify ibft to load the - plugin without ifcfg-rh or to change the plugin order. - - - Note that ibft plugin uses /sbin/iscsiadm and thus requires - CAP_SYS_ADMIN capability. + These plugins are deprecated and their selection has no effect. + This is now handled by nm-initrd-generator. -- cgit 1.3.0-6-gf8a5