From aafc1dbe4712c86189bbc1d4d54ad8cb4c69be7e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 5 Oct 2020 22:27:18 +0200 Subject: New upstream version 1.27.90 --- man/NetworkManager.conf.xml | 93 +++++++++++++++++++++++++++++---------------- 1 file changed, 61 insertions(+), 32 deletions(-) (limited to 'man/NetworkManager.conf.xml') diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 76a535fb..6b573890 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -179,7 +179,7 @@ plugins-=remove-me option uses a built-in DHCP client which is not currently as featureful as the external clients. If this key is missing, it defaults to &NM_CONFIG_DEFAULT_MAIN_DHCP;. - It the chosen plugin is not available, clients are looked for + If the chosen plugin is not available, clients are looked for in this order: dhclient, dhcpcd, internal. @@ -309,7 +309,8 @@ no-auto-default=* default: NetworkManager will update /etc/resolv.conf to reflect the nameservers - provided by currently active connections. + provided by currently active connections. The rc-manager + setting (below) controls how this is done. dnsmasq: NetworkManager will run dnsmasq as a local caching nameserver, using "Conditional Forwarding" if you are connected to a VPN, and then update @@ -349,37 +350,57 @@ no-auto-default=* rc-manager - Set the resolv.conf - management mode. The default value depends on NetworkManager build - options, and this version of NetworkManager was build with a default of - "&NM_CONFIG_DEFAULT_MAIN_RC_MANAGER;". - Regardless of this setting, NetworkManager will - always write resolv.conf to its runtime state directory - &nmrundir;/resolv.conf. + + Set the resolv.conf + management mode. This option is about how NetworkManager writes to + /etc/resolv.conf, if at all. + The default value depends on NetworkManager build + options, and this version of NetworkManager was build with a default of + "&NM_CONFIG_DEFAULT_MAIN_RC_MANAGER;". + Regardless of this setting, NetworkManager will + always write its version of resolv.conf to its runtime state directory + as &nmrundir;/resolv.conf. + + If you configure dns=none or make /etc/resolv.conf + immutable with chattr +i, NetworkManager will ignore this setting and + always choose unmanaged (below). + + auto: if systemd-resolved plugin is configured via + the dns setting or if it gets detected as main DNS plugin, + NetworkManager will update systemd-resolved without touching /etc/resolv.conf. + Alternatively, if resolvconf or netconfig are enabled + at compile time and the respective binary is found, NetworkManager will automatically use it. + Note that if you install or uninstall these binaries, you need to reload the + rc-manager setting with SIGHUP or + systemctl reload NetworkManager. As last fallback + it uses the symlink option (see next). + symlink: If /etc/resolv.conf is - a regular file, NetworkManager will replace the file on update. If - /etc/resolv.conf is instead a symlink, NetworkManager - will leave it alone. Unless the symlink points to the internal file - &nmrundir;/resolv.conf, - in which case the symlink will be updated to emit an inotify notification. - This allows the user to conveniently instruct NetworkManager not - to manage /etc/resolv.conf by replacing it with - a symlink. + a regular file or does not exist, NetworkManager will write the file directly. + If /etc/resolv.conf is instead a symlink, NetworkManager + will leave it alone. Unless the symlink points to the internal file + &nmrundir;/resolv.conf, + in which case the symlink will be updated to emit an inotify notification. + This allows the user to conveniently instruct NetworkManager not + to manage /etc/resolv.conf by replacing it with + a symlink. + file: NetworkManager will write - /etc/resolv.conf as file. If it finds - a symlink to an existing target, it will follow the symlink and - update the target instead. In no case will an existing symlink - be replaced by a file. Note that older versions of NetworkManager - behaved differently and would replace dangling symlinks with a - plain file. + /etc/resolv.conf as regular file. If it finds + a symlink to an existing target, it will follow the symlink and + update the target instead. In no case will an existing symlink + be replaced by a file. Note that older versions of NetworkManager + behaved differently and would replace dangling symlinks with a + plain file. + resolvconf: NetworkManager will run - resolvconf to update the DNS configuration. + resolvconf to update the DNS configuration. netconfig: NetworkManager will run - netconfig to update the DNS configuration. + netconfig to update the DNS configuration. unmanaged: don't touch - /etc/resolv.conf. + /etc/resolv.conf. none: deprecated alias for - symlink. + symlink. @@ -403,7 +424,7 @@ no-auto-default=* debug Comma separated list of options to aid debugging. This value will be combined with the environment - variable NM_DEBUG. Currently the following + variable NM_DEBUG. Currently, the following values are supported: RLIMIT_CORE: set ulimit -c unlimited @@ -478,7 +499,7 @@ no-auto-default=* Set devices that should be ignored by NetworkManager. - See for the syntax how to + See for the syntax on how to specify a device. @@ -740,6 +761,10 @@ ipv6.ip6-privacy=0 If left unspecified, the default value for the interface type is used. + + ipv4.dhcp-vendor-class-identifier + If left unspecified, the default is to not send the DHCP option to the server. + ipv4.dns-priority If unspecified or zero, use 50 for VPN profiles @@ -805,6 +830,10 @@ ipv6.ip6-privacy=0 vpn.timeout If left unspecified, default value of 60 seconds is used. + + wifi.ap-isolation + If left unspecified, AP isolation is disabled. + wifi.cloned-mac-address If left unspecified, it defaults to "preserve". @@ -1027,7 +1056,7 @@ managed=1 wifi.backend - Specify the Wi-Fi backend used for the device. Currently supported + Specify the Wi-Fi backend used for the device. Currently, supported are wpa_supplicant and iwd (experimental). @@ -1044,7 +1073,7 @@ managed=1 - sriov-num-vfs + , sriov-num-vfs Specify the number of virtual functions (VF) to enable @@ -1247,7 +1276,7 @@ enable=nm-version-min:1.2 # Match against the maximum allowed version. The example matches # versions 1.2.0, 1.2.2, 1.2.4. Again, only the last version digit -# is allowed to be smaller. So this would not match match on 1.1.10. +# is allowed to be smaller. So this would not match on 1.1.10. [.config] enable=nm-version-max:1.2.6 -- cgit 1.3.0-6-gf8a5