diff options
Diffstat (limited to 'man')
| -rw-r--r-- | man/NetworkManager-dispatcher.8 | 4 | ||||
| -rw-r--r-- | man/NetworkManager-wait-online.service.8 | 4 | ||||
| -rw-r--r-- | man/NetworkManager.8 | 6 | ||||
| -rw-r--r-- | man/NetworkManager.conf.5 | 15 | ||||
| -rw-r--r-- | man/NetworkManager.conf.xml | 9 | ||||
| -rw-r--r-- | man/nm-cloud-setup.8 | 6 | ||||
| -rw-r--r-- | man/nm-initrd-generator.8 | 6 | ||||
| -rw-r--r-- | man/nm-online.1 | 6 | ||||
| -rw-r--r-- | man/nm-openvswitch.7 | 38 | ||||
| -rw-r--r-- | man/nm-openvswitch.xml | 34 | ||||
| -rw-r--r-- | man/nm-settings-dbus.5 | 14 | ||||
| -rw-r--r-- | man/nm-settings-ifcfg-rh.5 | 20 | ||||
| -rw-r--r-- | man/nm-settings-ifcfg-rh.xsl | 12 | ||||
| -rw-r--r-- | man/nm-settings-keyfile.5 | 10 | ||||
| -rw-r--r-- | man/nm-settings-keyfile.xsl | 4 | ||||
| -rw-r--r-- | man/nm-settings-nmcli.5 | 14 | ||||
| -rw-r--r-- | man/nmcli-examples.7 | 68 | ||||
| -rw-r--r-- | man/nmcli-examples.xml | 68 | ||||
| -rw-r--r-- | man/nmcli.1 | 12 | ||||
| -rw-r--r-- | man/nmcli.xml | 8 | ||||
| -rw-r--r-- | man/nmtui.1 | 6 |
21 files changed, 187 insertions, 177 deletions
diff --git a/man/NetworkManager-dispatcher.8 b/man/NetworkManager-dispatcher.8 index 615e080b..48311cd2 100644 --- a/man/NetworkManager-dispatcher.8 +++ b/man/NetworkManager-dispatcher.8 @@ -2,9 +2,9 @@ .\" Title: NetworkManager-dispatcher .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 07/25/2024 +.\" Date: 08/09/2024 .\" Manual: Network management daemons -.\" Source: NetworkManager-dispatcher 1.48.6 +.\" Source: NetworkManager-dispatcher 1.48.8 .\" Language: English .\" .TH "NETWORKMANAGER\-DISPATCHER" "8" "" "NetworkManager\-dispatcher 1\&" "Network management daemons" diff --git a/man/NetworkManager-wait-online.service.8 b/man/NetworkManager-wait-online.service.8 index 9d5c4d4e..c5700134 100644 --- a/man/NetworkManager-wait-online.service.8 +++ b/man/NetworkManager-wait-online.service.8 @@ -2,9 +2,9 @@ .\" Title: NetworkManager-wait-online.service .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 07/25/2024 +.\" Date: 08/09/2024 .\" Manual: Network management daemons -.\" Source: NetworkManager-wait-online.service 1.48.6 +.\" Source: NetworkManager-wait-online.service 1.48.8 .\" Language: English .\" .TH "NETWORKMANAGER\-WAIT\-ONLINE\&" "8" "" "NetworkManager\-wait\-online\&" "Network management daemons" diff --git a/man/NetworkManager.8 b/man/NetworkManager.8 index 1f856fb3..d7c92139 100644 --- a/man/NetworkManager.8 +++ b/man/NetworkManager.8 @@ -2,12 +2,12 @@ .\" Title: NetworkManager .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 07/25/2024 +.\" Date: 08/09/2024 .\" Manual: Network management daemons -.\" Source: NetworkManager 1.48.6 +.\" Source: NetworkManager 1.48.8 .\" Language: English .\" -.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.48\&.6" "Network management daemons" +.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.48\&.8" "Network management daemons" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 index 024c69e0..32fc7d3f 100644 --- a/man/NetworkManager.conf.5 +++ b/man/NetworkManager.conf.5 @@ -2,12 +2,12 @@ .\" Title: NetworkManager.conf .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 07/25/2024 +.\" Date: 08/09/2024 .\" Manual: Configuration -.\" Source: NetworkManager 1.48.6 +.\" Source: NetworkManager 1.48.8 .\" Language: English .\" -.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.48\&.6" "Configuration" +.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.48\&.8" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -195,7 +195,7 @@ ignore\-carrier which overwrites this setting if specified (See \fIignore\-carrier\fR)\&. Otherwise, it is a list of matches to specify for which device carrier should be ignored\&. See the section called \(lqDevice List Format\(rq -for the syntax how to specify a device\&. Note that master types like bond, bridge, and team ignore carrier by default\&. You can however revert that default using the "except:" specifier (or better, use the per\-device setting instead of the deprecated setting)\&. +for the syntax how to specify a device\&. Note that controller types like bond, bridge, and team ignore carrier by default\&. You can however revert that default using the "except:" specifier (or better, use the per\-device setting instead of the deprecated setting)\&. .RE .PP \fIassume\-ipv6ll\-only\fR @@ -784,8 +784,13 @@ for details)\&. If left unspecified, the default value is 3 tries before failing the connection\&. .RE .PP +\fIconnection\&.autoconnect\-ports\fR +.RS 4 +.RE +.PP \fIconnection\&.autoconnect\-slaves\fR .RS 4 +This is deprecated, please use "connection\&.autoconnect\-ports" instead\&. .RE .PP \fIconnection\&.down\-on\-poweroff\fR @@ -1093,7 +1098,7 @@ sections, by having different sections with a name that all start with "connecti .nf [connection] ipv6\&.ip6\-privacy=0 -connection\&.autoconnect\-slaves=1 +connection\&.autoconnect\-ports=1 vpn\&.timeout=120 [connection\-wifi\-wlan0] diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index d86523c1..4c490657 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -219,7 +219,7 @@ no-auto-default=* if specified (See <xref linkend="ignore-carrier"/>). Otherwise, it is a list of matches to specify for which device carrier should be ignored. See <xref linkend="device-spec"/> for the - syntax how to specify a device. Note that master types like + syntax how to specify a device. Note that controller types like bond, bridge, and team ignore carrier by default. You can however revert that default using the "except:" specifier (or better, use the per-device setting instead of the deprecated setting). @@ -858,7 +858,12 @@ ipv6.ip6-privacy=0 </para></listitem> </varlistentry> <varlistentry> + <term><varname>connection.autoconnect-ports</varname></term> + </varlistentry> + <varlistentry> <term><varname>connection.autoconnect-slaves</varname></term> + <listitem><para>This is deprecated, please use "connection.autoconnect-ports" instead. + </para></listitem> </varlistentry> <varlistentry> <term><varname>connection.down-on-poweroff</varname></term> @@ -1125,7 +1130,7 @@ ipv6.ip6-privacy=0 <programlisting> [connection] ipv6.ip6-privacy=0 -connection.autoconnect-slaves=1 +connection.autoconnect-ports=1 vpn.timeout=120 [connection-wifi-wlan0] diff --git a/man/nm-cloud-setup.8 b/man/nm-cloud-setup.8 index 059625c5..9a42586d 100644 --- a/man/nm-cloud-setup.8 +++ b/man/nm-cloud-setup.8 @@ -2,12 +2,12 @@ .\" Title: nm-cloud-setup .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 07/25/2024 +.\" Date: 08/09/2024 .\" Manual: Automatic Network Configuration in Cloud with NetworkManager -.\" Source: NetworkManager 1.48.6 +.\" Source: NetworkManager 1.48.8 .\" Language: English .\" -.TH "NM\-CLOUD\-SETUP" "8" "" "NetworkManager 1\&.48\&.6" "Automatic Network Configuratio" +.TH "NM\-CLOUD\-SETUP" "8" "" "NetworkManager 1\&.48\&.8" "Automatic Network Configuratio" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-initrd-generator.8 b/man/nm-initrd-generator.8 index 8404fa8f..cd860ca1 100644 --- a/man/nm-initrd-generator.8 +++ b/man/nm-initrd-generator.8 @@ -2,12 +2,12 @@ .\" Title: nm-initrd-generator .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 07/25/2024 +.\" Date: 08/09/2024 .\" Manual: System Administration -.\" Source: NetworkManager 1.48.6 +.\" Source: NetworkManager 1.48.8 .\" Language: English .\" -.TH "NM\-INITRD\-GENERATOR" "8" "" "NetworkManager 1\&.48\&.6" "System Administration" +.TH "NM\-INITRD\-GENERATOR" "8" "" "NetworkManager 1\&.48\&.8" "System Administration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-online.1 b/man/nm-online.1 index ce9f5385..f9bbbacc 100644 --- a/man/nm-online.1 +++ b/man/nm-online.1 @@ -2,12 +2,12 @@ .\" Title: nm-online .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 07/25/2024 +.\" Date: 08/09/2024 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.48.6 +.\" Source: NetworkManager 1.48.8 .\" Language: English .\" -.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.48\&.6" "General Commands Manual" +.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.48\&.8" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-openvswitch.7 b/man/nm-openvswitch.7 index df88a7da..cc01eeca 100644 --- a/man/nm-openvswitch.7 +++ b/man/nm-openvswitch.7 @@ -2,12 +2,12 @@ .\" Title: nm-openvswitch .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 07/25/2024 +.\" Date: 08/09/2024 .\" Manual: Open vSwitch support overview -.\" Source: NetworkManager 1.48.6 +.\" Source: NetworkManager 1.48.8 .\" Language: English .\" -.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.48\&.6" "Open vSwitch support overview" +.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.48\&.8" "Open vSwitch support overview" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -58,7 +58,7 @@ NetworkManager only ever talks to a single OVSDB instance via an UNIX domain soc .sp -1 .IP \(bu 2.3 .\} -The configuration is made up of Bridges, Ports and Interfaces\&. Interfaces are always enslaved to Ports, and Ports are always enslaved to Bridges\&. +The configuration is made up of Bridges, Ports and Interfaces\&. Interfaces are always attached to Ports, and Ports are always attached to Bridges\&. .RE .sp .RS 4 @@ -81,7 +81,7 @@ NetworkManager only creates Bridges, Ports and Interfaces you ask it to\&. Unlik .sp -1 .IP \(bu 2.3 .\} -You can\*(Aqt enslave Interface directly to a Bridge\&. You always need a Port, even if it has just one interface\&. +You can\*(Aqt attach Interface directly to a Bridge\&. You always need a Port, even if it has just one interface\&. .RE .sp .RS 4 @@ -111,16 +111,16 @@ There are no bonds either\&. The bonding is enabled by enslaving multiple Interf .SS "Bridges" .PP Bridges are represented by connections of ovs\-bridge -type\&. Due to the limitations of OVSDB, "empty" Bridges (with no Ports) can\*(Aqt exist\&. NetworkManager inserts the records for Bridges into OVSDB when a Port is enslaved\&. +type\&. Due to the limitations of OVSDB, "empty" Bridges (with no Ports) can\*(Aqt exist\&. NetworkManager inserts the records for Bridges into OVSDB when a Port is attached\&. .SS "Ports" .PP Ports are represented by connections of ovs\-port -type\&. Due to the limitations of OVSDB, "empty" Ports (with no Interfaces) can\*(Aqt exist\&. Ports can also be configured to do VLAN tagging or Bonding\&. NetworkManager inserts the records for Ports into OVSDB when an Interface is enslaved\&. Ports must be enslaved to a Bridge\&. +type\&. Due to the limitations of OVSDB, "empty" Ports (with no Interfaces) can\*(Aqt exist\&. Ports can also be configured to do VLAN tagging or Bonding\&. NetworkManager inserts the records for Ports into OVSDB when an Interface is attached\&. Ports must be attached to a Bridge\&. .SS "Interfaces" .PP -Interfaces are represented by a connections enslaved to a Port\&. The system interfaces (that have a corresponding Linux link) have a respective +Interfaces are represented by a connections attached to a Port\&. The system interfaces (that have a corresponding Linux link) have a respective connection\&.type -of the link (e\&.g\&. "wired", "bond", "dummy", etc\&.)\&. Other interfaces ("internal" or "patch" interfaces) are of ovs\-interface type\&. The OVSDB entries are inserted upon enslavement to a Port\&. +of the link (e\&.g\&. "wired", "bond", "dummy", etc\&.)\&. Other interfaces ("internal" or "patch" interfaces) are of ovs\-interface type\&. The OVSDB entries are inserted upon attachment to a Port\&. .SH "EXAMPLES" .PP \fBExample\ \&1.\ \&Creating a Bridge with a single internal Interface\fR @@ -131,10 +131,10 @@ of the link (e\&.g\&. "wired", "bond", "dummy", etc\&.)\&. Other interfaces ("in .nf $ \fBnmcli conn add type ovs\-bridge conn\&.interface bridge0\fR Connection \*(Aqovs\-bridge\-bridge0\*(Aq (d10fc64d\-1d48\-4394\-a1b8\-e1aea72f27d5) successfully added\&. -$ \fBnmcli conn add type ovs\-port conn\&.interface port0 master bridge0\fR +$ \fBnmcli conn add type ovs\-port conn\&.interface port0 controller bridge0\fR Connection \*(Aqovs\-port\-port0\*(Aq (5ae22bae\-bba4\-4815\-9ade\-7e635633e1f0) successfully added\&. -$ \fBnmcli conn add type ovs\-interface slave\-type ovs\-port conn\&.interface iface0 \e - master port0 ipv4\&.method manual ipv4\&.address 192\&.0\&.2\&.1/24\fR +$ \fBnmcli conn add type ovs\-interface port\-type ovs\-port conn\&.interface iface0 \e + controller port0 ipv4\&.method manual ipv4\&.address 192\&.0\&.2\&.1/24\fR Connection \*(Aqovs\-interface\-iface0\*(Aq (3640d2a1\-a2fd\-4718\-92f1\-cffadb5b6cdc) successfully added\&. .fi .if n \{\ @@ -150,9 +150,9 @@ As said above, you need to create a Port even for a single interface\&. Also, be .RS 4 .\} .nf -$ \fBnmcli conn add type ovs\-port conn\&.interface port1 master bridge0\fR +$ \fBnmcli conn add type ovs\-port conn\&.interface port1 controller bridge0\fR Connection \*(Aqovs\-port\-port1\*(Aq (67d041eb\-8e7b\-4458\-afee\-a1d07c9c4552) successfully added\&. -$ \fBnmcli conn add type ethernet conn\&.interface eth0 master port1\fR +$ \fBnmcli conn add type ethernet conn\&.interface eth0 controller port1\fR Connection \*(Aqovs\-slave\-eth0\*(Aq (d459c45c\-cf78\-4c1c\-b4b7\-505e71379624) successfully added\&. .fi .if n \{\ @@ -167,9 +167,9 @@ Again, you need a port\&. .RS 4 .\} .nf -$ \fBnmcli conn add type ovs\-port conn\&.interface port2 master bridge0 ovs\-port\&.tag 120\fR +$ \fBnmcli conn add type ovs\-port conn\&.interface port2 controller bridge0 ovs\-port\&.tag 120\fR Connection \*(Aqovs\-port\-port2\*(Aq (3994c093\-4ef7\-4549\-a4fd\-627b831c3cb8) successfully added\&. -$ \fBnmcli conn add type ethernet conn\&.interface eth1 master port2\fR +$ \fBnmcli conn add type ethernet conn\&.interface eth1 controller port2\fR Connection \*(Aqovs\-slave\-eth1\*(Aq (099be06e\-71ad\-484d\-8d5a\-fcadc5f207f5) successfully added\&. .fi .if n \{\ @@ -184,11 +184,11 @@ It\*(Aqs just a port with a tag\&. .RS 4 .\} .nf -$ \fBnmcli conn add type ovs\-port conn\&.interface bond0 master bridge0\fR +$ \fBnmcli conn add type ovs\-port conn\&.interface bond0 controller bridge0\fR Connection \*(Aqovs\-port\-bond0\*(Aq (d154ebf9\-e999\-4e1b\-a084\-a3de53d25d8a) successfully added\&. -$ \fBnmcli conn add type ethernet conn\&.interface eth2 master bond0\fR +$ \fBnmcli conn add type ethernet conn\&.interface eth2 controller bond0\fR Connection \*(Aqovs\-slave\-eth2\*(Aq (475ac1bf\-30b2\-4534\-a877\-27f33f58b082) successfully added\&. -$ \fBnmcli conn add type ethernet conn\&.interface eth3 master bond0\fR +$ \fBnmcli conn add type ethernet conn\&.interface eth3 controller bond0\fR Connection \*(Aqovs\-slave\-eth3\*(Aq (8dedeecb\-ed12\-482b\-b77a\-24a4fb835136) successfully added\&. .fi .if n \{\ diff --git a/man/nm-openvswitch.xml b/man/nm-openvswitch.xml index 67b5ea7c..ff852129 100644 --- a/man/nm-openvswitch.xml +++ b/man/nm-openvswitch.xml @@ -57,8 +57,8 @@ </listitem> <listitem> <para>The configuration is made up of Bridges, Ports and - Interfaces. Interfaces are always enslaved to Ports, and Ports are always - enslaved to Bridges.</para> + Interfaces. Interfaces are always attached to Ports, and Ports are always + attached to Bridges.</para> </listitem> <listitem> <para>NetworkManager only creates Bridges, Ports and Interfaces @@ -66,7 +66,7 @@ local interface nor its port automatically.</para> </listitem> <listitem> - <para>You can't enslave Interface directly to a Bridge. You + <para>You can't attach Interface directly to a Bridge. You always need a Port, even if it has just one interface.</para> </listitem> <listitem> @@ -89,7 +89,7 @@ <link linkend="nm-settings.property.connection.type">type</link>. Due to the limitations of OVSDB, "empty" Bridges (with no Ports) can't exist. NetworkManager inserts the records for Bridges into OVSDB when a Port is - enslaved. + attached. </para> </refsect2> @@ -101,18 +101,18 @@ Due to the limitations of OVSDB, "empty" Ports (with no Interfaces) can't exist. Ports can also be configured to do VLAN tagging or Bonding. NetworkManager inserts the records for Ports into OVSDB when an Interface is - enslaved. Ports must be enslaved to a Bridge.</para> + attached. Ports must be attached to a Bridge.</para> </refsect2> <refsect2> <title>Interfaces</title> - <para>Interfaces are represented by a connections enslaved to a Port. The + <para>Interfaces are represented by a connections attached to a Port. The system interfaces (that have a corresponding Linux link) have a respective <link linkend="nm-settings.property.connection.type">connection.type</link> of the link (e.g. "wired", "bond", "dummy", etc.). Other interfaces ("internal" or "patch" interfaces) are of ovs-interface type. The OVSDB entries are - inserted upon enslavement to a Port.</para> + inserted upon attachment to a Port.</para> </refsect2> </refsect1> @@ -123,10 +123,10 @@ <example><title>Creating a Bridge with a single internal Interface</title> <screen><prompt>$ </prompt><userinput>nmcli conn add type ovs-bridge conn.interface bridge0</userinput> Connection 'ovs-bridge-bridge0' (d10fc64d-1d48-4394-a1b8-e1aea72f27d5) successfully added. -<prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface port0 master bridge0</userinput> +<prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface port0 controller bridge0</userinput> Connection 'ovs-port-port0' (5ae22bae-bba4-4815-9ade-7e635633e1f0) successfully added. -<prompt>$ </prompt><userinput>nmcli conn add type ovs-interface slave-type ovs-port conn.interface iface0 \ - master port0 ipv4.method manual ipv4.address 192.0.2.1/24</userinput> +<prompt>$ </prompt><userinput>nmcli conn add type ovs-interface port-type ovs-port conn.interface iface0 \ + controller port0 ipv4.method manual ipv4.address 192.0.2.1/24</userinput> Connection 'ovs-interface-iface0' (3640d2a1-a2fd-4718-92f1-cffadb5b6cdc) successfully added. </screen> <para>As said above, you need to create a Port even for a single interface. @@ -136,29 +136,29 @@ Connection 'ovs-interface-iface0' (3640d2a1-a2fd-4718-92f1-cffadb5b6cdc) success </example> <example><title>Adding a Linux interface to a Bridge</title> -<screen><prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface port1 master bridge0</userinput> +<screen><prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface port1 controller bridge0</userinput> Connection 'ovs-port-port1' (67d041eb-8e7b-4458-afee-a1d07c9c4552) successfully added. -<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth0 master port1</userinput> +<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth0 controller port1</userinput> Connection 'ovs-slave-eth0' (d459c45c-cf78-4c1c-b4b7-505e71379624) successfully added. </screen> <para>Again, you need a port.</para> </example> <example><title>Creating a VLAN</title> -<screen><prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface port2 master bridge0 ovs-port.tag 120</userinput> +<screen><prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface port2 controller bridge0 ovs-port.tag 120</userinput> Connection 'ovs-port-port2' (3994c093-4ef7-4549-a4fd-627b831c3cb8) successfully added. -<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth1 master port2</userinput> +<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth1 controller port2</userinput> Connection 'ovs-slave-eth1' (099be06e-71ad-484d-8d5a-fcadc5f207f5) successfully added. </screen> <para>It's just a port with a tag.</para> </example> <example><title>Creating a Bond</title> -<screen><prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface bond0 master bridge0</userinput> +<screen><prompt>$ </prompt><userinput>nmcli conn add type ovs-port conn.interface bond0 controller bridge0</userinput> Connection 'ovs-port-bond0' (d154ebf9-e999-4e1b-a084-a3de53d25d8a) successfully added. -<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth2 master bond0</userinput> +<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth2 controller bond0</userinput> Connection 'ovs-slave-eth2' (475ac1bf-30b2-4534-a877-27f33f58b082) successfully added. -<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth3 master bond0</userinput> +<prompt>$ </prompt><userinput>nmcli conn add type ethernet conn.interface eth3 controller bond0</userinput> Connection 'ovs-slave-eth3' (8dedeecb-ed12-482b-b77a-24a4fb835136) successfully added. </screen> <para>It's just a Port with multiple interfaces. See nm-settings-nmcli manual for diff --git a/man/nm-settings-dbus.5 b/man/nm-settings-dbus.5 index 64af4524..289e1f81 100644 --- a/man/nm-settings-dbus.5 +++ b/man/nm-settings-dbus.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-dbus .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 07/25/2024 +.\" Date: 08/09/2024 .\" Manual: Configuration -.\" Source: NetworkManager 1.48.6 +.\" Source: NetworkManager 1.48.8 .\" Language: English .\" -.TH "NM\-SETTINGS\-DBUS" "5" "" "NetworkManager 1\&.48\&.6" "Configuration" +.TH "NM\-SETTINGS\-DBUS" "5" "" "NetworkManager 1\&.48\&.8" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -168,7 +168,7 @@ NMSettingConnectionAutoconnectSlaves (int32) T}:T{ \ \& T}:T{ -Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection\&. This only has a real effect for master connections\&. The properties "autoconnect", "autoconnect\-priority" and "autoconnect\-retries" are unrelated to this setting\&. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, \-1: default\&. If \-1 (default) is set, global connection\&.autoconnect\-slaves is read to determine the real value\&. If it is default as well, this fallbacks to 0\&. +Whether or not ports of this connection should be automatically brought up when NetworkManager activates this connection\&. This only has a real effect for controller connections\&. The properties "autoconnect", "autoconnect\-priority" and "autoconnect\-retries" are unrelated to this setting\&. The permitted values are: 0: leave port connections untouched, 1: activate all the port connections with this connection, \-1: default\&. If \-1 (default) is set, global connection\&.autoconnect\-slaves is read to determine the real value\&. If it is default as well, this fallbacks to 0\&. Deprecated 1\&.46\&. Use "autoconnect\-ports" instead, this is just an alias\&. T} @@ -263,7 +263,7 @@ string T}:T{ \ \& T}:T{ -Interface name of the master device or UUID of the master connection\&. +Interface name of the controller device or UUID of the controller connection\&. Deprecated 1\&.46\&. Use "controller" instead, this is just an alias\&. T} @@ -385,7 +385,7 @@ string T}:T{ \ \& T}:T{ -Setting name of the device type of this slave\*(Aqs master connection (eg, "bond"), or NULL if this connection is not a slave\&. +Setting name of the device type of this port\*(Aqs controller connection (eg, "bond"), or NULL if this connection is not a port\&. Deprecated 1\&.46\&. Use "port\-type" instead, this is just an alias\&. T} @@ -4809,7 +4809,7 @@ NMVlanFlags (uint32) T}:T{ \ \& T}:T{ -One or more flags which control the behavior and features of the VLAN interface\&. Flags include 0x1 (reorder\-headers) (reordering of output packet headers), 0x2 (gvrp) (use of the GVRP protocol), and 0x4 (loose\-binding) (loose binding of the interface to its master device\*(Aqs operating state)\&. 0x8 (mvrp) (use of the MVRP protocol)\&. +One or more flags which control the behavior and features of the VLAN interface\&. Flags include 0x1 (reorder\-headers) (reordering of output packet headers), 0x2 (gvrp) (use of the GVRP protocol), and 0x4 (loose\-binding) (loose binding of the interface to its controller device\*(Aqs operating state)\&. 0x8 (mvrp) (use of the MVRP protocol)\&. The default value of this property is NM_VLAN_FLAG_REORDER_HEADERS, but it used to be 0\&. To preserve backward compatibility, the default\-value in the D\-Bus API continues to be 0 and a missing property on D\-Bus is still considered as 0\&. T} diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5 index 62847ccb..ba0fa3c9 100644 --- a/man/nm-settings-ifcfg-rh.5 +++ b/man/nm-settings-ifcfg-rh.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-ifcfg-rh .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 07/25/2024 +.\" Date: 08/09/2024 .\" Manual: Configuration -.\" Source: NetworkManager 1.48.6 +.\" Source: NetworkManager 1.48.8 .\" Language: English .\" -.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.48\&.6" "Configuration" +.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.48\&.8" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -184,8 +184,8 @@ BOOTPROTO=dhcp .\} .nf \fBBonding configuration:\fR -ifcfg\-BOND: ifcfg\-BOND\-slave: -NAME=BOND NAME=BOND\-slave +ifcfg\-BOND: ifcfg\-BOND\-port: +NAME=BOND NAME=BOND\-port UUID=b41888aa\-924c\-450c\-b0f8\-85a4f0a51b4a UUID=9bb048e4\-286a\-4cc3\-b104\-007dbd20decb DEVICE=bond100 DEVICE=eth0 BONDING_OPTS="mode=balance\-rr miimon=100" ONBOOT=yes @@ -215,16 +215,16 @@ NAME=team0\-profile UUID=1d3460a0\-7b37\-457f\-a300\-fe8d92da4807 ONBOOT=yes -ifcfg\-my_team0_slave1: -NAME=team0\-slave1 +ifcfg\-my_team0_port1: +NAME=team0\-port1 UUID=d5aed298\-c567\-4cc1\-b808\-6d38ecef9e64 DEVICE=eth1 ONBOOT=yes TEAM_MASTER=team0 DEVICETYPE=TeamPort -ifcfg\-my_team0_slave2: -NAME=team0\-slave2 +ifcfg\-my_team0_port2: +NAME=team0\-port2 UUID=94e75f4e\-e5ad\-401c\-8962\-31e0ae5d2215 DEVICE=eth2 ONBOOT=yes @@ -2105,7 +2105,7 @@ MASTER, MASTER_UUID, TEAM_MASTER, TEAM_MASTER_UUID, BRIDGE, BRIDGE_UUID T}:T{ \ \& T}:T{ -Reference to master connection\&. The variable used depends on the connection type and the value\&. In general, if the *_UUID variant is present, the variant without *_UUID is ignored\&. NetworkManager attempts to write both for compatibility with legacy tooling\&. +Reference to controller connection\&. The variable used depends on the connection type and the value\&. In general, if the *_UUID variant is present, the variant without *_UUID is ignored\&. NetworkManager attempts to write both for compatibility with legacy tooling\&. T} T{ slave\-type diff --git a/man/nm-settings-ifcfg-rh.xsl b/man/nm-settings-ifcfg-rh.xsl index 8ad3b108..790cd79c 100644 --- a/man/nm-settings-ifcfg-rh.xsl +++ b/man/nm-settings-ifcfg-rh.xsl @@ -153,8 +153,8 @@ BOOTPROTO=dhcp <para> <programlisting> <emphasis role="bold">Bonding configuration:</emphasis> -ifcfg-BOND: ifcfg-BOND-slave: -NAME=BOND NAME=BOND-slave +ifcfg-BOND: ifcfg-BOND-port: +NAME=BOND NAME=BOND-port UUID=b41888aa-924c-450c-b0f8-85a4f0a51b4a UUID=9bb048e4-286a-4cc3-b104-007dbd20decb DEVICE=bond100 DEVICE=eth0 BONDING_OPTS="mode=balance-rr miimon=100" ONBOOT=yes @@ -177,16 +177,16 @@ NAME=team0-profile UUID=1d3460a0-7b37-457f-a300-fe8d92da4807 ONBOOT=yes -ifcfg-my_team0_slave1: -NAME=team0-slave1 +ifcfg-my_team0_port1: +NAME=team0-port1 UUID=d5aed298-c567-4cc1-b808-6d38ecef9e64 DEVICE=eth1 ONBOOT=yes TEAM_MASTER=team0 DEVICETYPE=TeamPort -ifcfg-my_team0_slave2: -NAME=team0-slave2 +ifcfg-my_team0_port2: +NAME=team0-port2 UUID=94e75f4e-e5ad-401c-8962-31e0ae5d2215 DEVICE=eth2 ONBOOT=yes diff --git a/man/nm-settings-keyfile.5 b/man/nm-settings-keyfile.5 index f39a1505..c8286b23 100644 --- a/man/nm-settings-keyfile.5 +++ b/man/nm-settings-keyfile.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-keyfile .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 07/25/2024 +.\" Date: 08/09/2024 .\" Manual: Configuration -.\" Source: NetworkManager 1.48.6 +.\" Source: NetworkManager 1.48.8 .\" Language: English .\" -.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.48\&.6" "Configuration" +.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.48\&.8" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -176,8 +176,8 @@ id=MainBridge id=br\-port\-1 uuid=171ae855\-a0ab\-42b6\-bd0c\-60f5812eea9d uuid=d6e8ae98\-71f8\-4b3d\-9d2d\-2e26048fe794 interface\-name=MainBridge interface\-name=em1 type=bridge type=ethernet - master=MainBridge -[bridge] slave\-type=bridge + controller=MainBridge +[bridge] port\-type=bridge interface\-name=MainBridge .fi diff --git a/man/nm-settings-keyfile.xsl b/man/nm-settings-keyfile.xsl index d216ee15..90cb6268 100644 --- a/man/nm-settings-keyfile.xsl +++ b/man/nm-settings-keyfile.xsl @@ -173,8 +173,8 @@ id=MainBridge id=br-port-1 uuid=171ae855-a0ab-42b6-bd0c-60f5812eea9d uuid=d6e8ae98-71f8-4b3d-9d2d-2e26048fe794 interface-name=MainBridge interface-name=em1 type=bridge type=ethernet - master=MainBridge -[bridge] slave-type=bridge + controller=MainBridge +[bridge] port-type=bridge interface-name=MainBridge </programlisting> </para> diff --git a/man/nm-settings-nmcli.5 b/man/nm-settings-nmcli.5 index 240bb824..9edf5cd6 100644 --- a/man/nm-settings-nmcli.5 +++ b/man/nm-settings-nmcli.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-nmcli .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 07/25/2024 +.\" Date: 08/09/2024 .\" Manual: Configuration -.\" Source: NetworkManager 1.48.6 +.\" Source: NetworkManager 1.48.8 .\" Language: English .\" -.TH "NM\-SETTINGS\-NMCLI" "5" "" "NetworkManager 1\&.48\&.6" "Configuration" +.TH "NM\-SETTINGS\-NMCLI" "5" "" "NetworkManager 1\&.48\&.8" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -129,7 +129,7 @@ Special values: default (\-1), forever (0) .PP \fBconnection\&.autoconnect\-slaves\fR .RS 4 -Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection\&. This only has a real effect for master connections\&. The properties "autoconnect", "autoconnect\-priority" and "autoconnect\-retries" are unrelated to this setting\&. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, \-1: default\&. If \-1 (default) is set, global connection\&.autoconnect\-slaves is read to determine the real value\&. If it is default as well, this fallbacks to 0\&. +Whether or not ports of this connection should be automatically brought up when NetworkManager activates this connection\&. This only has a real effect for controller connections\&. The properties "autoconnect", "autoconnect\-priority" and "autoconnect\-retries" are unrelated to this setting\&. The permitted values are: 0: leave port connections untouched, 1: activate all the port connections with this connection, \-1: default\&. If \-1 (default) is set, global connection\&.autoconnect\-slaves is read to determine the real value\&. If it is default as well, this fallbacks to 0\&. .sp Deprecated 1\&.46\&. Use "autoconnect\-ports" instead, this is just an alias\&. .sp @@ -226,7 +226,7 @@ Valid values: default (\-1), no (0), resolve (1), yes (2) .RS 4 Alias: master .sp -Interface name of the master device or UUID of the master connection\&. +Interface name of the controller device or UUID of the controller connection\&. .sp Deprecated 1\&.46\&. Use "controller" instead, this is just an alias\&. .sp @@ -333,7 +333,7 @@ Format: list of strings .RS 4 Alias: slave\-type .sp -Setting name of the device type of this slave\*(Aqs master connection (eg, "bond"), or NULL if this connection is not a slave\&. +Setting name of the device type of this port\*(Aqs controller connection (eg, "bond"), or NULL if this connection is not a port\&. .sp Deprecated 1\&.46\&. Use "port\-type" instead, this is just an alias\&. .sp @@ -5200,7 +5200,7 @@ Format: list of vlan\&.egress\-priority\-map objects .RS 4 Alias: flags .sp -One or more flags which control the behavior and features of the VLAN interface\&. Flags include "reorder\-headers" (0x1) (reordering of output packet headers), "gvrp" (0x2) (use of the GVRP protocol), and "loose\-binding" (0x4) (loose binding of the interface to its master device\*(Aqs operating state)\&. "mvrp" (0x8) (use of the MVRP protocol)\&. +One or more flags which control the behavior and features of the VLAN interface\&. Flags include "reorder\-headers" (0x1) (reordering of output packet headers), "gvrp" (0x2) (use of the GVRP protocol), and "loose\-binding" (0x4) (loose binding of the interface to its controller device\*(Aqs operating state)\&. "mvrp" (0x8) (use of the MVRP protocol)\&. .sp The default value of this property is NM_VLAN_FLAG_REORDER_HEADERS, but it used to be 0\&. To preserve backward compatibility, the default\-value in the D\-Bus API continues to be 0 and a missing property on D\-Bus is still considered as 0\&. .sp diff --git a/man/nmcli-examples.7 b/man/nmcli-examples.7 index b5e184bc..69d07716 100644 --- a/man/nmcli-examples.7 +++ b/man/nmcli-examples.7 @@ -2,12 +2,12 @@ .\" Title: nmcli-examples .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 07/25/2024 +.\" Date: 08/09/2024 .\" Manual: Examples -.\" Source: NetworkManager 1.48.6 +.\" Source: NetworkManager 1.48.8 .\" Language: English .\" -.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.48\&.6" "Examples" +.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.48\&.8" "Examples" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -240,65 +240,65 @@ are set to \*(Aq0x02\*(Aq (\*(Aqalways ask\*(Aq, see \fBnm-settings-nmcli\fR(5) )\&. This is particularly useful for OTP based VPNs, as the user needs to be prompted for the password each time the connection is activated\&. .PP -\fBExample\ \&8.\ \&Adding a bonding master and two slave connection profiles\fR +\fBExample\ \&8.\ \&Adding a bonding controller and two port connection profiles\fR .sp .if n \{\ .RS 4 .\} .nf $ \fBnmcli con add type bond ifname mybond0 mode active\-backup\fR -$ \fBnmcli con add type ethernet ifname eth1 master mybond0\fR -$ \fBnmcli con add type ethernet ifname eth2 master mybond0\fR +$ \fBnmcli con add type ethernet ifname eth1 controller mybond0\fR +$ \fBnmcli con add type ethernet ifname eth2 controller mybond0\fR .fi .if n \{\ .RE .\} .PP -This example demonstrates adding a bond master connection and two slaves\&. The first command adds a master bond connection, naming the bonding interface +This example demonstrates adding a bond controller connection and two ports\&. The first command adds a controller bond connection, naming the bonding interface \fImybond0\fR and using \fIactive\-backup\fR -mode\&. The next two commands add slaves connections, both enslaved to -\fImybond0\fR\&. The first slave will be bound to +mode\&. The next two commands add port connections, both attached as port to +\fImybond0\fR\&. The first port will be bound to \fIeth1\fR interface, the second to \fIeth2\fR\&. .PP -\fBExample\ \&9.\ \&Adding a team master and two slave connection profiles\fR +\fBExample\ \&9.\ \&Adding a team controller and two port connection profiles\fR .sp .if n \{\ .RS 4 .\} .nf -$ \fBnmcli con add type team con\-name Team1 ifname Team1 config team1\-master\-json\&.conf\fR -$ \fBnmcli con add type ethernet con\-name Team1\-slave1 ifname em1 master Team1\fR -$ \fBnmcli con add type ethernet con\-name Team1\-slave2 ifname em2 master Team1\fR +$ \fBnmcli con add type team con\-name Team1 ifname Team1 config team1\-controller\-json\&.conf\fR +$ \fBnmcli con add type ethernet con\-name Team1\-port1 ifname em1 controller Team1\fR +$ \fBnmcli con add type ethernet con\-name Team1\-port2 ifname em2 controller Team1\fR .fi .if n \{\ .RE .\} .PP -This example demonstrates adding a team master connection profile and two slaves\&. It is very similar to the bonding example\&. The first command adds a master team profile, naming the team interface and the profile -\fITeam1\fR\&. The team configuration for the master is read from -\fIteam1\-master\-json\&.conf\fR +This example demonstrates adding a team controller connection profile and two ports\&. It is very similar to the bonding example\&. The first command adds a controller team profile, naming the team interface and the profile +\fITeam1\fR\&. The team configuration for the controller is read from +\fIteam1\-controller\-json\&.conf\fR file\&. Later, you can change the configuration with \fImodify\fR -command (\fBnmcli con modify Team1 team\&.config team1\-master\-another\-json\&.conf\fR)\&. The last two commands add slaves profiles, both enslaved to -\fITeam1\fR\&. The first slave will be bound to the +command (\fBnmcli con modify Team1 team\&.config team1\-controller\-another\-json\&.conf\fR)\&. The last two commands add port profiles, both attached as port to +\fITeam1\fR\&. The first port will be bound to the \fIem1\fR interface, the second to -\fIem2\fR\&. The slaves don\*(Aqt specify +\fIem2\fR\&. The ports don\*(Aqt specify \fIconfig\fR and thus \fIteamd\fR -will use its default configuration\&. You will activate the whole setup by activating both slaves: +will use its default configuration\&. You will activate the whole setup by activating both ports: .sp .if n \{\ .RS 4 .\} .nf - $ \fBnmcli con up Team1\-slave1\fR - $ \fBnmcli con up Team1\-slave2\fR + $ \fBnmcli con up Team1\-port1\fR + $ \fBnmcli con up Team1\-port2\fR .fi .if n \{\ .RE @@ -306,24 +306,24 @@ will use its default configuration\&. You will activate the whole setup by activ .sp By default, the created profiles are marked for auto\-activation\&. But if another connection has been activated on the device, the new profile won\*(Aqt activate automatically and you need to activate it manually\&. .PP -\fBExample\ \&10.\ \&Adding a bridge and two slave profiles\fR +\fBExample\ \&10.\ \&Adding a bridge and two port profiles\fR .sp .if n \{\ .RS 4 .\} .nf $ \fBnmcli con add type bridge con\-name TowerBridge ifname TowerBridge\fR -$ \fBnmcli con add type ethernet con\-name br\-slave\-1 ifname ens3 master TowerBridge\fR -$ \fBnmcli con add type ethernet con\-name br\-slave\-2 ifname ens4 master TowerBridge\fR +$ \fBnmcli con add type ethernet con\-name br\-port\-1 ifname ens3 controller TowerBridge\fR +$ \fBnmcli con add type ethernet con\-name br\-port\-2 ifname ens4 controller TowerBridge\fR $ \fBnmcli con modify TowerBridge bridge\&.stp no\fR .fi .if n \{\ .RE .\} .PP -This example demonstrates adding a bridge master connection and two slaves\&. The first command adds a master bridge connection, naming the bridge interface and the profile as -\fITowerBridge\fR\&. The next two commands add slaves profiles, both will be enslaved to -\fITowerBridge\fR\&. The first slave will be tied to +This example demonstrates adding a bridge controller connection and two ports\&. The first command adds a controller bridge connection, naming the bridge interface and the profile as +\fITowerBridge\fR\&. The next two commands add ports profiles, both will be attached as port to +\fITowerBridge\fR\&. The first port will be tied to \fIens3\fR interface, the second to \fIens4\fR\&. The last command will disable 802\&.1D STP for the TowerBridge profile\&. @@ -503,8 +503,8 @@ connection\&.timestamp: 0 connection\&.read\-only: no connection\&.permissions: connection\&.zone: \-\- -connection\&.master: \-\- -connection\&.slave\-type: \-\- +connection\&.controller: \-\- +connection\&.port\-type: \-\- connection\&.secondaries: connection\&.gateway\-ping\-timeout: 0 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- @@ -593,8 +593,8 @@ connection\&.timestamp: 0 connection\&.read\-only: no connection\&.permissions: connection\&.zone: \-\- -connection\&.master: \-\- -connection\&.slave\-type: \-\- +connection\&.controller: \-\- +connection\&.port\-type: \-\- connection\&.secondaries: connection\&.gateway\-ping\-timeout: 0 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- @@ -653,8 +653,8 @@ connection\&.timestamp: 0 connection\&.read\-only: no connection\&.permissions: connection\&.zone: \-\- -connection\&.master: \-\- -connection\&.slave\-type: \-\- +connection\&.controller: \-\- +connection\&.port\-type: \-\- connection\&.secondaries: connection\&.gateway\-ping\-timeout: 0 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- diff --git a/man/nmcli-examples.xml b/man/nmcli-examples.xml index 5249d6ba..71ea5dc8 100644 --- a/man/nmcli-examples.xml +++ b/man/nmcli-examples.xml @@ -187,56 +187,56 @@ B,DISPATCH</screen> </para> </example> - <example><title>Adding a bonding master and two slave connection profiles</title> + <example><title>Adding a bonding controller and two port connection profiles</title> <screen><prompt>$ </prompt><userinput>nmcli con add type bond ifname mybond0 mode active-backup</userinput> -<prompt>$ </prompt><userinput>nmcli con add type ethernet ifname eth1 master mybond0</userinput> -<prompt>$ </prompt><userinput>nmcli con add type ethernet ifname eth2 master mybond0</userinput></screen> +<prompt>$ </prompt><userinput>nmcli con add type ethernet ifname eth1 controller mybond0</userinput> +<prompt>$ </prompt><userinput>nmcli con add type ethernet ifname eth2 controller mybond0</userinput></screen> <para> - This example demonstrates adding a bond master connection and two slaves. The - first command adds a master bond connection, naming the bonding interface + This example demonstrates adding a bond controller connection and two ports. The + first command adds a controller bond connection, naming the bonding interface <emphasis>mybond0</emphasis> and using <emphasis>active-backup</emphasis> mode. - The next two commands add slaves connections, both enslaved to <emphasis>mybond0</emphasis>. - The first slave will be bound to <emphasis>eth1</emphasis> interface, the second to + The next two commands add port connections, both attached as port to <emphasis>mybond0</emphasis>. + The first port will be bound to <emphasis>eth1</emphasis> interface, the second to <emphasis>eth2</emphasis>. </para> </example> - <example><title>Adding a team master and two slave connection profiles</title> -<screen><prompt>$ </prompt><userinput>nmcli con add type team con-name Team1 ifname Team1 config team1-master-json.conf</userinput> -<prompt>$ </prompt><userinput>nmcli con add type ethernet con-name Team1-slave1 ifname em1 master Team1</userinput> -<prompt>$ </prompt><userinput>nmcli con add type ethernet con-name Team1-slave2 ifname em2 master Team1</userinput></screen> + <example><title>Adding a team controller and two port connection profiles</title> +<screen><prompt>$ </prompt><userinput>nmcli con add type team con-name Team1 ifname Team1 config team1-controller-json.conf</userinput> +<prompt>$ </prompt><userinput>nmcli con add type ethernet con-name Team1-port1 ifname em1 controller Team1</userinput> +<prompt>$ </prompt><userinput>nmcli con add type ethernet con-name Team1-port2 ifname em2 controller Team1</userinput></screen> <para> - This example demonstrates adding a team master connection profile and two slaves. It is - very similar to the bonding example. The first command adds a master team profile, naming + This example demonstrates adding a team controller connection profile and two ports. It is + very similar to the bonding example. The first command adds a controller team profile, naming the team interface and the profile <emphasis>Team1</emphasis>. The team configuration - for the master is read from <emphasis>team1-master-json.conf</emphasis> file. Later, you can + for the controller is read from <emphasis>team1-controller-json.conf</emphasis> file. Later, you can change the configuration with <emphasis>modify</emphasis> command - (<emphasis role="bold">nmcli con modify Team1 team.config team1-master-another-json.conf</emphasis>). - The last two commands add slaves profiles, both enslaved to <emphasis>Team1</emphasis>. - The first slave will be bound to the <emphasis>em1</emphasis> interface, the second to - <emphasis>em2</emphasis>. The slaves don't specify <emphasis>config</emphasis> and thus + (<emphasis role="bold">nmcli con modify Team1 team.config team1-controller-another-json.conf</emphasis>). + The last two commands add port profiles, both attached as port to <emphasis>Team1</emphasis>. + The first port will be bound to the <emphasis>em1</emphasis> interface, the second to + <emphasis>em2</emphasis>. The ports don't specify <emphasis>config</emphasis> and thus <emphasis>teamd</emphasis> will use its default configuration. You will activate the whole setup - by activating both slaves: -<screen> <prompt>$ </prompt><userinput>nmcli con up Team1-slave1</userinput> - <prompt>$ </prompt><userinput>nmcli con up Team1-slave2</userinput></screen> + by activating both ports: +<screen> <prompt>$ </prompt><userinput>nmcli con up Team1-port1</userinput> + <prompt>$ </prompt><userinput>nmcli con up Team1-port2</userinput></screen> By default, the created profiles are marked for auto-activation. But if another connection has been activated on the device, the new profile won't activate automatically and you need to activate it manually. </para> </example> - <example><title>Adding a bridge and two slave profiles</title> + <example><title>Adding a bridge and two port profiles</title> <screen><prompt>$ </prompt><userinput>nmcli con add type bridge con-name TowerBridge ifname TowerBridge</userinput> -<prompt>$ </prompt><userinput>nmcli con add type ethernet con-name br-slave-1 ifname ens3 master TowerBridge</userinput> -<prompt>$ </prompt><userinput>nmcli con add type ethernet con-name br-slave-2 ifname ens4 master TowerBridge</userinput> +<prompt>$ </prompt><userinput>nmcli con add type ethernet con-name br-port-1 ifname ens3 controller TowerBridge</userinput> +<prompt>$ </prompt><userinput>nmcli con add type ethernet con-name br-port-2 ifname ens4 controller TowerBridge</userinput> <prompt>$ </prompt><userinput>nmcli con modify TowerBridge bridge.stp no</userinput></screen> <para> - This example demonstrates adding a bridge master connection and two slaves. The - first command adds a master bridge connection, naming the bridge interface and + This example demonstrates adding a bridge controller connection and two ports. The + first command adds a controller bridge connection, naming the bridge interface and the profile as <emphasis>TowerBridge</emphasis>. - The next two commands add slaves profiles, both will be enslaved to + The next two commands add ports profiles, both will be attached as port to <emphasis>TowerBridge</emphasis>. - The first slave will be tied to <emphasis>ens3</emphasis> interface, the second to + The first port will be tied to <emphasis>ens3</emphasis> interface, the second to <emphasis>ens4</emphasis>. The last command will disable 802.1D STP for the TowerBridge profile. </para> @@ -375,8 +375,8 @@ connection.timestamp: 0 connection.read-only: no connection.permissions: connection.zone: -- -connection.master: -- -connection.slave-type: -- +connection.controller: -- +connection.port-type: -- connection.secondaries: connection.gateway-ping-timeout: 0 --------------------------------------------------------------------------- @@ -465,8 +465,8 @@ connection.timestamp: 0 connection.read-only: no connection.permissions: connection.zone: -- -connection.master: -- -connection.slave-type: -- +connection.controller: -- +connection.port-type: -- connection.secondaries: connection.gateway-ping-timeout: 0 --------------------------------------------------------------------------- @@ -525,8 +525,8 @@ connection.timestamp: 0 connection.read-only: no connection.permissions: connection.zone: -- -connection.master: -- -connection.slave-type: -- +connection.controller: -- +connection.port-type: -- connection.secondaries: connection.gateway-ping-timeout: 0 --------------------------------------------------------------------------- diff --git a/man/nmcli.1 b/man/nmcli.1 index 9c66c7ad..0293b868 100644 --- a/man/nmcli.1 +++ b/man/nmcli.1 @@ -2,12 +2,12 @@ .\" Title: nmcli .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 07/25/2024 +.\" Date: 08/09/2024 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.48.6 +.\" Source: NetworkManager 1.48.8 .\" Language: English .\" -.TH "NMCLI" "1" "" "NetworkManager 1\&.48\&.6" "General Commands Manual" +.TH "NMCLI" "1" "" "NetworkManager 1\&.48\&.8" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -793,7 +793,7 @@ bond .IP \(bu 2.3 .\} bond\-slave -(deprecated for ethernet with master) +(deprecated for ethernet with controller) .RE .sp .RS 4 @@ -816,7 +816,7 @@ bridge .IP \(bu 2.3 .\} bridge\-slave -(deprecated for ethernet with master) +(deprecated for ethernet with controller) .RE .sp .RS 4 @@ -1004,7 +1004,7 @@ team .IP \(bu 2.3 .\} team\-slave -(deprecated for ethernet with master) +(deprecated for ethernet with controller) .RE .sp .RS 4 diff --git a/man/nmcli.xml b/man/nmcli.xml index 62994047..f3b6706e 100644 --- a/man/nmcli.xml +++ b/man/nmcli.xml @@ -1031,7 +1031,7 @@ sort | awk ' /^(bond|bridge|team)-slave$/ { - printf " <listitem><para><literal>%s</literal> (deprecated for ethernet with master)</para></listitem>\n", $0; + printf " <listitem><para><literal>%s</literal> (deprecated for ethernet with controller)</para></listitem>\n", $0; next; } /^(wifi|ethernet|olpc-mash)$/ { @@ -1059,9 +1059,9 @@ <listitem><para><literal>adsl</literal></para></listitem> <listitem><para><literal>bluetooth</literal></para></listitem> <listitem><para><literal>bond</literal></para></listitem> - <listitem><para><literal>bond-slave</literal> (deprecated for ethernet with master)</para></listitem> + <listitem><para><literal>bond-slave</literal> (deprecated for ethernet with controller)</para></listitem> <listitem><para><literal>bridge</literal></para></listitem> - <listitem><para><literal>bridge-slave</literal> (deprecated for ethernet with master)</para></listitem> + <listitem><para><literal>bridge-slave</literal> (deprecated for ethernet with controller)</para></listitem> <listitem><para><literal>cdma</literal></para></listitem> <listitem><para><literal>dummy</literal></para></listitem> <listitem><para><literal>generic</literal></para></listitem> @@ -1078,7 +1078,7 @@ <listitem><para><literal>ovs-port</literal></para></listitem> <listitem><para><literal>pppoe</literal></para></listitem> <listitem><para><literal>team</literal></para></listitem> - <listitem><para><literal>team-slave</literal> (deprecated for ethernet with master)</para></listitem> + <listitem><para><literal>team-slave</literal> (deprecated for ethernet with controller)</para></listitem> <listitem><para><literal>tun</literal></para></listitem> <listitem><para><literal>veth</literal></para></listitem> <listitem><para><literal>vlan</literal></para></listitem> diff --git a/man/nmtui.1 b/man/nmtui.1 index 926612b4..89e4d1a8 100644 --- a/man/nmtui.1 +++ b/man/nmtui.1 @@ -2,12 +2,12 @@ .\" Title: nmtui .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 07/25/2024 +.\" Date: 08/09/2024 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.48.6 +.\" Source: NetworkManager 1.48.8 .\" Language: English .\" -.TH "NMTUI" "1" "" "NetworkManager 1\&.48\&.6" "General Commands Manual" +.TH "NMTUI" "1" "" "NetworkManager 1\&.48\&.8" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- |