diff options
Diffstat (limited to 'man')
| -rw-r--r-- | man/NetworkManager-dispatcher.xml | 7 | ||||
| -rw-r--r-- | man/NetworkManager.conf.xml | 94 | ||||
| -rw-r--r-- | man/common.ent.in | 1 | ||||
| -rw-r--r-- | man/nm-cloud-setup.xml | 32 | ||||
| -rw-r--r-- | man/nm-initrd-generator.xml | 34 | ||||
| -rw-r--r-- | man/nm-settings-nmcli.xsl | 9 |
6 files changed, 157 insertions, 20 deletions
diff --git a/man/NetworkManager-dispatcher.xml b/man/NetworkManager-dispatcher.xml index 807e5c4c..8c1e2d34 100644 --- a/man/NetworkManager-dispatcher.xml +++ b/man/NetworkManager-dispatcher.xml @@ -50,9 +50,10 @@ NetworkManager-dispatcher will execute scripts in the <filename>/{etc,usr/lib}/NetworkManager/dispatcher.d</filename> directory or subdirectories in - alphabetical order in response to network events. Each script should - be a regular executable file owned by root. Furthermore, it must not be - writable by group or other, and not setuid. + alphabetical order in response to network events. Files in <filename>/etc</filename> + take precedence over identically-named files in <filename>/usr/lib</filename>. + Each script should be a regular executable file owned by root. Furthermore, it must + not be writable by group or other, and not setuid. </para> <para> Each script receives two arguments, the first being the interface name of the diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 474e7951..46528879 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -167,17 +167,14 @@ plugins-=remove-me </varlistentry> <varlistentry> <term><varname>dhcp</varname></term> - <listitem><para>This key sets up what DHCP client - NetworkManager will use. Allowed values depend on build configuration and - typically include <literal>internal</literal> and <literal>dhcpcd</literal>. - Support for unmaintained <literal>dhclient</literal> client has been deprecated - and disabled by default.</para> + <listitem><para>This key sets up what DHCP client NetworkManager will + use. Allowed values depend on build configuration; this version of + NetworkManager was built with support for the following clients: + &NM_DHCP_CLIENTS_ENABLED_TEXT;.</para> <para>The <literal>internal</literal> client is built-in, while other options may require an external DHCP client to be installed.</para> <para>If this key is missing, <literal>&NM_CONFIG_DEFAULT_MAIN_DHCP;</literal> - is used with a fallback to other suppored clients in this order: - <literal>internal</literal>, <literal>dhcpcd</literal>, - <literal>dhclient</literal>.</para></listitem> + is used with a fallback to other supported clients.</para></listitem> </varlistentry> <varlistentry> <term><varname>no-auto-default</varname></term> @@ -335,20 +332,24 @@ no-auto-default=* <para><literal>systemd-resolved</literal>: NetworkManager will push the DNS configuration to systemd-resolved</para> + <para><literal>dnsconfd</literal>: NetworkManager will + push the DNS configuration to dnsconfd</para> and by default set ipvX.routed-dns to + yes, so servers are contacted through right interfaces. + <para><literal>none</literal>: NetworkManager will not modify resolv.conf. This implies <literal>rc-manager</literal> <literal>unmanaged</literal></para> - <para>Note that the plugins <literal>dnsmasq</literal> and <literal>systemd-resolved</literal> - are caching local nameservers. + <para>Note that the plugins <literal>dnsmasq</literal>,<literal>systemd-resolved</literal> + and <literal>dnsconfd</literal> are caching local nameservers. Hence, when NetworkManager writes <filename>&nmrundir;/resolv.conf</filename> and <filename>/etc/resolv.conf</filename> (according to <literal>rc-manager</literal> setting below), the name server there will be localhost only. NetworkManager also writes a file <filename>&nmrundir;/no-stub-resolv.conf</filename> that contains the original name servers pushed to the DNS plugin.</para> - <para>When using <literal>dnsmasq</literal> and <literal>systemd-resolved</literal>, - per-connection added dns servers will always be queried using + <para>When using <literal>dnsmasq</literal>,<literal>systemd-resolved</literal> and + <literal>dnsconfd</literal> per-connection added dns servers will always be queried using the device the connection has been activated on.</para> </listitem> </varlistentry> @@ -360,7 +361,7 @@ no-auto-default=* management mode. This option is about how NetworkManager writes to <filename>/etc/resolv.conf</filename>, if at all. The default value depends on NetworkManager build - options, and this version of NetworkManager was build with a default of + options, and this version of NetworkManager was built with a default of "<literal>&NM_CONFIG_DEFAULT_MAIN_RC_MANAGER;</literal>". Regardless of this setting, NetworkManager will always write its version of resolv.conf to its runtime state directory @@ -869,6 +870,10 @@ ipv6.ip6-privacy=0 <listitem><para>Whether the connection will be brought down before the system is powered off.</para></listitem> </varlistentry> <varlistentry> + <term><varname>connection.ip-ping-addresses-require-all</varname></term> + <listitem><para>Whether it is sufficient for any ping check to succeed among the list of target addresses, or if all ping checks must succeed for the entire list of target addresses.</para></listitem> + </varlistentry> + <varlistentry> <term><varname>connection.mud-url</varname></term> <listitem><para>If unspecified, MUD URL defaults to <literal>"none"</literal>.</para></listitem> </varlistentry> @@ -938,6 +943,9 @@ ipv6.ip6-privacy=0 <listitem><para>If configured explicitly to 0, the MTU is not reconfigured during device activation unless it is required due to IPv6 constraints. If left unspecified, a DHCP/IPv6 SLAAC provided value is used or a default of 1500.</para></listitem> </varlistentry> <varlistentry> + <term><varname>ipv4.routed-dns</varname></term> + </varlistentry> + <varlistentry> <term><varname>ipv4.dad-timeout</varname></term> </varlistentry> <varlistentry> @@ -951,10 +959,18 @@ ipv6.ip6-privacy=0 <listitem><para>If left unspecified, it defaults to "ifname".</para></listitem> </varlistentry> <varlistentry> + <term><varname>ipv4.dhcp-ipv6-only-preferred</varname></term> + <listitem><para>If left unspecified, the "IPv6-only preferred" DHCPv4 option is disabled.</para></listitem> + </varlistentry> + <varlistentry> <term><varname>ipv4.dhcp-hostname-flags</varname></term> <listitem><para>If left unspecified, the value 3 (fqdn-encoded,fqdn-serv-update) is used.</para></listitem> </varlistentry> <varlistentry> + <term><varname>ipv4.dhcp-send-hostname</varname></term> + <listitem><para>Whether a hostname is sent to the DHCP server when acquiring a lease. When the property is not specified in the connection, the global value from NetworkManager configuration is looked up. If the global value is not set, the value from ipv4.dhcp-send-hostname-deprecated, which defaults to true, is used for backwards compatibility. In the future this will change and, in absence of a global default, it will always fallback to true.</para></listitem> + </varlistentry> + <varlistentry> <term><varname>ipv4.dhcp-send-release</varname></term> <listitem><para>Whether the DHCP client will send RELEASE message when bringing the connection down.</para></listitem> </varlistentry> @@ -990,6 +1006,9 @@ ipv6.ip6-privacy=0 </para></listitem> </varlistentry> <varlistentry> + <term><varname>ipv6.routed-dns</varname></term> + </varlistentry> + <varlistentry> <term><varname>ipv6.addr-gen-mode</varname></term> <listitem><para>If the per-profile setting is either "default" or "default-or-eui64", the global default is used. If the default is unspecified, the fallback value is either "stable-privacy" @@ -1012,6 +1031,10 @@ ipv6.ip6-privacy=0 <listitem><para>If left unspecified, the value 1 (fqdn-serv-update) is used.</para></listitem> </varlistentry> <varlistentry> + <term><varname>ipv6.dhcp-send-hostname</varname></term> + <listitem><para>Whether a hostname is sent to the DHCP server when acquiring a lease. When the property is not specified in the connection, the global value from NetworkManager configuration is looked up. If the global value is not set, the value from ipv6.dhcp-send-hostname-deprecated, which defaults to true, is used for backwards compatibility. In the future this will change and, in absence of a global default, it will always fallback to true.</para></listitem> + </varlistentry> + <varlistentry> <term><varname>ipv6.dhcp-send-release</varname></term> <listitem><para>Whether the DHCP client will send RELEASE message when bringing the connection down.</para></listitem> </varlistentry> @@ -1495,7 +1518,7 @@ managed=1 <listitem><para>If set, controls what body content NetworkManager checks for when requesting the URI for connectivity checking. Note that this only compares - that the HTTP response starts with the specifid text, + that the HTTP response starts with the specified text, it does not compare the exact string. This behavior might change in the future, so avoid relying on it. If missing, the response defaults to "NetworkManager is online". @@ -1528,6 +1551,29 @@ managed=1 </para> </listitem> </varlistentry> + <varlistentry> + <term><varname>resolve-mode</varname></term> + <listitem> + <para> + String indicating how DNS servers retrieved from global configuration and connections + should be used. <literal>backup</literal> - Indicates that they can be freely merged + and used for the same purposes. <literal>prefer</literal> - Forbids DNS servers + retrieved from connections to be used for general queries that are not subdomains of + domains set by connection. <literal>exclusive</literal> - Forbids use of connection + DNS servers for any query. Currently relevant only for Dnsconfd plugin. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><varname>certification-authority</varname></term> + <listitem> + <para> + String specifying absolute path to bundle of CA certificates that must be used for + validation of certificates presented by DNS servers when encrypted DNS is used. + Currently relevant only for Dnsconfd plugin. + </para> + </listitem> + </varlistentry> </variablelist> </para> </refsect1> @@ -1553,8 +1599,24 @@ managed=1 <term><varname>servers</varname></term> <listitem> <para> - A list of addresses of DNS servers to be used for the given domain. - </para> + A list of addresses of DNS servers to be used for the + given domain. Each server can be specified either as a + plain IP address or with a URI syntax. When it is + specified as an URI, the following forms are supported: + </para> + <para> + <simplelist type="horiz" columns="1"> + <member>dns+udp://<varname>ADDRESS</varname>[:<varname>PORT</varname>] : DNS</member> + <member>dns+tls://<varname>ADDRESS</varname>[:<varname>PORT</varname>][#<varname>SERVERNAME]</varname> : DNS over TLS</member> + </simplelist> + </para> + <para> + <varname>ADDRESS</varname> is an IPv4 or IPv6 + address. When it is IPv6, it must be enclosed in square + brackets ('[' and ']'). When it is a IPv6 link-local + address, the address should be followed by a percent + sign ('%') and an interface name. + </para> </listitem> </varlistentry> <varlistentry> diff --git a/man/common.ent.in b/man/common.ent.in index 71a47f42..2d17b146 100644 --- a/man/common.ent.in +++ b/man/common.ent.in @@ -10,3 +10,4 @@ <!ENTITY NM_CONFIG_DEFAULT_MAIN_DHCP "@NM_CONFIG_DEFAULT_MAIN_DHCP@"> <!ENTITY NM_CONFIG_DEFAULT_MAIN_MIGRATE_IFCFG_RH_TEXT "@NM_CONFIG_DEFAULT_MAIN_MIGRATE_IFCFG_RH_TEXT@"> <!ENTITY NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT "@NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT@"> +<!ENTITY NM_DHCP_CLIENTS_ENABLED_TEXT "@NM_DHCP_CLIENTS_ENABLED@"> diff --git a/man/nm-cloud-setup.xml b/man/nm-cloud-setup.xml index 7f9a7dbc..b24de6b9 100644 --- a/man/nm-cloud-setup.xml +++ b/man/nm-cloud-setup.xml @@ -184,6 +184,10 @@ <para><literal>NM_CLOUD_SETUP_ALIYUN</literal>: boolean, whether Alibaba Cloud (Aliyun) support is enabled. Defaults to <literal>no</literal>.</para> </listitem> + <listitem> + <para><literal>NM_CLOUD_SETUP_OCI</literal>: boolean, whether Oracle Cloud (OCI) support is enabled. Defaults + to <literal>no</literal>.</para> + </listitem> </itemizedlist> </refsect1> @@ -417,6 +421,34 @@ ln -s /etc/systemd/system/timers.target.wants/nm-cloud-setup.timer /usr/lib/syst </itemizedlist> </refsect2> + <refsect2> + <title>Oracle Cloud (OCI)</title> + + <para>For OCI, the tools tries to fetch configuration from <literal>http://169.254.169.254/</literal>. Currently, it only + configures IPv4 and does nothing about IPv6. It will do the following.</para> + + <itemizedlist> + <listitem> + <para>First fetch <literal>http://169.254.169.254/opc/v2/instance</literal> to determine whether the + expected API is present. This determines whether OCI environment is detected and whether to proceed + to configure the host using OCI meta data.</para> + </listitem> + <listitem> + <para>Fetch <literal>http://169.254.169.254/opc/v2/vnics</literal> to get the configuration + for all the VNICs, getting their MAC address, private IP address, gateway and subnet block.</para> + </listitem> + <listitem> + <para>Then nm-cloud-setup iterates over all interfaces for which it could fetch a configuration. + If no ethernet device for the respective MAC address is found, it is skipped. + Also, if the device is currently not activated in NetworkManager or if the currently + activated profile has a user-data <literal>org.freedesktop.nm-cloud-setup.skip=yes</literal>, + it is skipped. Also, there is only one interface and one IP address, the tool does nothing.</para> + <para>Then the tool configures the system like doing for AWS environment. That is, using source based policy routing + with the tables/rules 30200/30400.</para> + </listitem> + </itemizedlist> + </refsect2> + </refsect1> <refsect1> diff --git a/man/nm-initrd-generator.xml b/man/nm-initrd-generator.xml index 51015ea8..2d3d8755 100644 --- a/man/nm-initrd-generator.xml +++ b/man/nm-initrd-generator.xml @@ -157,6 +157,9 @@ <member><option>rd.bootif</option></member> <member><option>rd.neednet</option></member> <member><option>rd.ethtool</option></member> + <member><option>rd.net.dns</option></member> + <member><option>rd.net.dns-backend</option></member> + <member><option>rd.net.dns-resolve-mode</option></member> <member><option>rd.net.timeout.dhcp</option></member> <member><option>rd.net.dhcp.retry</option></member> <member><option>rd.net.dhcp.vendor-class</option></member> @@ -227,6 +230,37 @@ <listitem> <para>NetworkManager supports the + <option>rd.net.dns-backend</option>=<replaceable>VALUE</replaceable> + kernel command line option to configure the DNS processing + mode. See the description of the <literal>"dns"</literal> key in + the <literal>"main section"</literal> paragraph of <link + linkend='NetworkManager.conf'><citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry></link>. For + example: <literal>rd.net.dns-backend=systemd-resolved</literal>, + <literal>rd.net.dns-backend=dnsconfd</literal> + </para> + </listitem> + + <listitem> + <para>NetworkManager supports the + <option>rd.net.dns</option>=<replaceable>SERVER</replaceable> + kernel command line option to configure a global (non + interface-specific) DNS server. The option can be specified + multiple time to add more than one server. Each server can be + specified as a plain IP or as an URI according to the + description in the "global-dns-domains sections" paragraph of + <link + linkend='NetworkManager.conf'><citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry></link>. For + example: <literal>rd.net.dns=2001:db8::1</literal>, + <literal>rd.net.dns=dns+tls://192.0.2.0</literal>, + <literal>rd.net.dns=dns+tls://[2001:db8::2]:5353#example.org</literal>. + In addition, it supports configuring the <literal>"resolve-mode"</literal> + key in the global DNS configuration via the + <option>rd.net.dns-resolve-mode</option> command line option. + </para> + </listitem> + + <listitem> + <para>NetworkManager supports the <option>rd.net.dhcp.dscp</option>={<replaceable>CS0</replaceable>|<replaceable>CS4</replaceable>|<replaceable>CS6</replaceable>} kernel command line option to set a specific DSCP (TOS) value in the IP header of DHCP messages. diff --git a/man/nm-settings-nmcli.xsl b/man/nm-settings-nmcli.xsl index 2f1d035c..0da9d095 100644 --- a/man/nm-settings-nmcli.xsl +++ b/man/nm-settings-nmcli.xsl @@ -141,7 +141,14 @@ <term> <option> <xsl:attribute name="id">nm-settings-nmcli.property.<xsl:value-of select="$setting_name"/>.<xsl:value-of select="@name"/></xsl:attribute> - <xsl:value-of select="$setting_name"/>.<xsl:value-of select="@name"/> + <xsl:choose> + <xsl:when test="@rename"> + <xsl:value-of select="$setting_name"/>.<xsl:value-of select="@rename"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$setting_name"/>.<xsl:value-of select="@name"/> + </xsl:otherwise> + </xsl:choose> </option> </term> <listitem> |