From e96d74409128c6a977e31f24fad9b267d2feb9a1 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 9 Aug 2024 18:57:15 +0200 Subject: New upstream version 1.48.8 --- man/nmcli-examples.xml | 68 +++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'man/nmcli-examples.xml') 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 - Adding a bonding master and two slave connection profiles + Adding a bonding controller and two port connection profiles $ nmcli con add type bond ifname mybond0 mode active-backup -$ nmcli con add type ethernet ifname eth1 master mybond0 -$ nmcli con add type ethernet ifname eth2 master mybond0 +$ nmcli con add type ethernet ifname eth1 controller mybond0 +$ nmcli con add type ethernet ifname eth2 controller mybond0 - 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 mybond0 and using active-backup mode. - The next two commands add slaves connections, both enslaved to mybond0. - The first slave will be bound to eth1 interface, the second to + The next two commands add port connections, both attached as port to mybond0. + The first port will be bound to eth1 interface, the second to eth2. - Adding a team master and two slave connection profiles -$ nmcli con add type team con-name Team1 ifname Team1 config team1-master-json.conf -$ nmcli con add type ethernet con-name Team1-slave1 ifname em1 master Team1 -$ nmcli con add type ethernet con-name Team1-slave2 ifname em2 master Team1 + Adding a team controller and two port connection profiles +$ nmcli con add type team con-name Team1 ifname Team1 config team1-controller-json.conf +$ nmcli con add type ethernet con-name Team1-port1 ifname em1 controller Team1 +$ nmcli con add type ethernet con-name Team1-port2 ifname em2 controller Team1 - 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 Team1. The team configuration - for the master is read from team1-master-json.conf file. Later, you can + for the controller is read from team1-controller-json.conf file. Later, you can change the configuration with modify command - (nmcli con modify Team1 team.config team1-master-another-json.conf). - The last two commands add slaves profiles, both enslaved to Team1. - The first slave will be bound to the em1 interface, the second to - em2. The slaves don't specify config and thus + (nmcli con modify Team1 team.config team1-controller-another-json.conf). + The last two commands add port profiles, both attached as port to Team1. + The first port will be bound to the em1 interface, the second to + em2. The ports don't specify config and thus teamd will use its default configuration. You will activate the whole setup - by activating both slaves: - $ nmcli con up Team1-slave1 - $ nmcli con up Team1-slave2 + by activating both ports: + $ nmcli con up Team1-port1 + $ nmcli con up Team1-port2 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. - Adding a bridge and two slave profiles + Adding a bridge and two port profiles $ nmcli con add type bridge con-name TowerBridge ifname TowerBridge -$ nmcli con add type ethernet con-name br-slave-1 ifname ens3 master TowerBridge -$ nmcli con add type ethernet con-name br-slave-2 ifname ens4 master TowerBridge +$ nmcli con add type ethernet con-name br-port-1 ifname ens3 controller TowerBridge +$ nmcli con add type ethernet con-name br-port-2 ifname ens4 controller TowerBridge $ nmcli con modify TowerBridge bridge.stp no - 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 TowerBridge. - 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 TowerBridge. - The first slave will be tied to ens3 interface, the second to + The first port will be tied to ens3 interface, the second to ens4. The last command will disable 802.1D STP for the TowerBridge profile. @@ -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 --------------------------------------------------------------------------- -- cgit 1.3.0-6-gf8a5