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 --- docs/api/html/NetworkManager.conf.html | 11 +++-- docs/api/html/NetworkManager.devhelp2 | 6 +-- docs/api/html/index.html | 2 +- docs/api/html/nm-dbus-types.html | 18 ++++---- docs/api/html/nm-openvswitch.html | 34 +++++++------- docs/api/html/nm-settings-dbus.html | 8 ++-- docs/api/html/nm-settings-ifcfg-rh.html | 14 +++--- docs/api/html/nm-settings-keyfile.html | 4 +- docs/api/html/nm-settings-nmcli.html | 8 ++-- docs/api/html/nmcli-examples.html | 68 ++++++++++++++-------------- docs/api/html/nmcli.html | 6 +-- docs/api/html/settings-connection.html | 6 +-- docs/api/html/settings-vlan.html | 2 +- docs/libnm/html/NMActiveConnection.html | 6 +-- docs/libnm/html/NMDevice.html | 2 +- docs/libnm/html/NMDeviceBond.html | 4 +- docs/libnm/html/NMDeviceBridge.html | 6 +-- docs/libnm/html/NMDeviceOvsBridge.html | 6 +-- docs/libnm/html/NMDeviceOvsPort.html | 6 +-- docs/libnm/html/NMDeviceTeam.html | 6 +-- docs/libnm/html/NMSettingConnection.html | 16 +++---- docs/libnm/html/NMSettingTeam.html | 4 +- docs/libnm/html/api-index-full.html | 4 ++ docs/libnm/html/index.html | 2 +- docs/libnm/html/libnm-nm-dbus-interface.html | 30 ++++++++---- docs/libnm/html/libnm-nm-utils.html | 6 +-- docs/libnm/html/libnm-nm-version-macros.html | 2 +- docs/libnm/html/libnm.devhelp2 | 7 +-- docs/libnm/html/usage.html | 2 +- 29 files changed, 158 insertions(+), 138 deletions(-) (limited to 'docs') diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html index 2b79ac84..fcd93162 100644 --- a/docs/api/html/NetworkManager.conf.html +++ b/docs/api/html/NetworkManager.conf.html @@ -224,7 +224,7 @@ no-auto-default=* if specified (See ignore-carrier). Otherwise, it is a list of matches to specify for which device carrier should be ignored. See the section called “Device List Format” 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). @@ -814,10 +814,15 @@ ipv6.ip6-privacy=0

-

connection.autoconnect-slaves

+

connection.autoconnect-ports

+

connection.autoconnect-slaves

+

This is deprecated, please use "connection.autoconnect-ports" instead. +

+ +

connection.down-on-poweroff

Whether the connection will be brought down before the system is powered off.

@@ -1105,7 +1110,7 @@ ipv6.ip6-privacy=0
 [connection]
 ipv6.ip6-privacy=0
-connection.autoconnect-slaves=1
+connection.autoconnect-ports=1
 vpn.timeout=120
 
 [connection-wifi-wlan0]
diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2
index 2102feb9..752eadad 100644
--- a/docs/api/html/NetworkManager.devhelp2
+++ b/docs/api/html/NetworkManager.devhelp2
@@ -823,12 +823,12 @@
     
     
     
-    
-    
+    
+    
     
     
     
-    
+    
     
     
     
diff --git a/docs/api/html/index.html b/docs/api/html/index.html
index cfb63607..0d68746b 100644
--- a/docs/api/html/index.html
+++ b/docs/api/html/index.html
@@ -16,7 +16,7 @@
 

- for NetworkManager 1.48.6 + for NetworkManager 1.48.8 The latest version of this documentation can be found on-line at https://networkmanager.dev/docs/api/latest/. diff --git a/docs/api/html/nm-dbus-types.html b/docs/api/html/nm-dbus-types.html index 6da92d30..0a4807df 100644 --- a/docs/api/html/nm-dbus-types.html +++ b/docs/api/html/nm-dbus-types.html @@ -520,7 +520,7 @@

-

a bond master interface

+

a bond controller interface

  @@ -565,7 +565,7 @@

-

a bridge master interface

+

a bridge controller interface

  @@ -580,7 +580,7 @@

-

a team master interface

+

a team controller interface

  @@ -4506,7 +4506,7 @@ -

NM_ACTIVATION_STATE_FLAG_IS_MASTER

+

NM_ACTIVATION_STATE_FLAG_IS_CONTROLLER

@@ -4514,14 +4514,14 @@

-

the device is a master.

+

the device is a controller.

  -

NM_ACTIVATION_STATE_FLAG_IS_SLAVE

+

NM_ACTIVATION_STATE_FLAG_IS_PORT

@@ -4529,7 +4529,7 @@

-

the device is a slave.

+

the device is a port.

  @@ -4581,7 +4581,7 @@ -

NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES

+

NM_ACTIVATION_STATE_FLAG_CONTROLLER_HAS_PORTS

@@ -4589,7 +4589,7 @@

-

The master has any slave devices attached. This only makes sense if the device is a master.

+

The controller has any port devices attached. This only makes sense if the device is a controller.

  diff --git a/docs/api/html/nm-openvswitch.html b/docs/api/html/nm-openvswitch.html index 42f15f5f..3f1b8460 100644 --- a/docs/api/html/nm-openvswitch.html +++ b/docs/api/html/nm-openvswitch.html @@ -47,12 +47,12 @@
  • NetworkManager only ever talks to a single OVSDB instance via an UNIX domain socket.

  • The configuration is made up of Bridges, Ports and - Interfaces. Interfaces are always enslaved to Ports, and Ports are always - enslaved to Bridges.

  • + Interfaces. Interfaces are always attached to Ports, and Ports are always + attached to Bridges.

  • NetworkManager only creates Bridges, Ports and Interfaces you ask it to. Unlike ovs-vsctl, it doesn't create the local interface nor its port automatically.

  • -
  • You can't enslave Interface directly to a Bridge. You +

  • You can't attach Interface directly to a Bridge. You always need a Port, even if it has just one interface.

  • There are no VLANs. The VLAN tagging is enabled by setting a ovs-port.tag @@ -69,7 +69,7 @@ type. 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.


  • @@ -80,17 +80,17 @@ 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.

    + attached. Ports must be attached to a Bridge.


    Interfaces

    -

    Interfaces are represented by a connections enslaved to a Port. The +

    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.

    + inserted upon attachment to a Port.

    @@ -100,10 +100,10 @@
    $ nmcli conn add type ovs-bridge conn.interface bridge0
     Connection 'ovs-bridge-bridge0' (d10fc64d-1d48-4394-a1b8-e1aea72f27d5) successfully added.
    -$ nmcli conn add type ovs-port conn.interface port0 master bridge0
    +$ nmcli conn add type ovs-port conn.interface port0 controller bridge0
     Connection 'ovs-port-port0' (5ae22bae-bba4-4815-9ade-7e635633e1f0) successfully added.
    -$ 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
    +$ 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
     Connection 'ovs-interface-iface0' (3640d2a1-a2fd-4718-92f1-cffadb5b6cdc) successfully added.
     

    As said above, you need to create a Port even for a single interface. @@ -115,9 +115,9 @@ Connection 'ovs-interface-iface0' (3640d2a1-a2fd-4718-92f1-cffadb5b6cdc) success

    Example 21. Adding a Linux interface to a Bridge

    -
    $ nmcli conn add type ovs-port conn.interface port1 master bridge0
    +
    $ nmcli conn add type ovs-port conn.interface port1 controller bridge0
     Connection 'ovs-port-port1' (67d041eb-8e7b-4458-afee-a1d07c9c4552) successfully added.
    -$ nmcli conn add type ethernet conn.interface eth0 master port1
    +$ nmcli conn add type ethernet conn.interface eth0 controller port1
     Connection 'ovs-slave-eth0' (d459c45c-cf78-4c1c-b4b7-505e71379624) successfully added.
     

    Again, you need a port.

    @@ -126,9 +126,9 @@ Connection 'ovs-slave-eth0' (d459c45c-cf78-4c1c-b4b7-505e71379624) successfully

    Example 22. Creating a VLAN

    -
    $ nmcli conn add type ovs-port conn.interface port2 master bridge0 ovs-port.tag 120
    +
    $ nmcli conn add type ovs-port conn.interface port2 controller bridge0 ovs-port.tag 120
     Connection 'ovs-port-port2' (3994c093-4ef7-4549-a4fd-627b831c3cb8) successfully added.
    -$ nmcli conn add type ethernet conn.interface eth1 master port2
    +$ nmcli conn add type ethernet conn.interface eth1 controller port2
     Connection 'ovs-slave-eth1' (099be06e-71ad-484d-8d5a-fcadc5f207f5) successfully added.
     

    It's just a port with a tag.

    @@ -137,11 +137,11 @@ Connection 'ovs-slave-eth1' (099be06e-71ad-484d-8d5a-fcadc5f207f5) successfully

    Example 23. Creating a Bond

    -
    $ nmcli conn add type ovs-port conn.interface bond0 master bridge0
    +
    $ nmcli conn add type ovs-port conn.interface bond0 controller bridge0
     Connection 'ovs-port-bond0' (d154ebf9-e999-4e1b-a084-a3de53d25d8a) successfully added.
    -$ nmcli conn add type ethernet conn.interface eth2 master bond0
    +$ nmcli conn add type ethernet conn.interface eth2 controller bond0
     Connection 'ovs-slave-eth2' (475ac1bf-30b2-4534-a877-27f33f58b082) successfully added.
    -$ nmcli conn add type ethernet conn.interface eth3 master bond0
    +$ nmcli conn add type ethernet conn.interface eth3 controller bond0
     Connection 'ovs-slave-eth3' (8dedeecb-ed12-482b-b77a-24a4fb835136) successfully added.
     

    It's just a Port with multiple interfaces. See nm-settings-nmcli manual for diff --git a/docs/api/html/nm-settings-dbus.html b/docs/api/html/nm-settings-dbus.html index 33867169..14a4fd9a 100644 --- a/docs/api/html/nm-settings-dbus.html +++ b/docs/api/html/nm-settings-dbus.html @@ -160,7 +160,7 @@ Depending on "connection.multi-connect", a profile can (auto)connect only once a autoconnect-slaves NMSettingConnectionAutoconnectSlaves (int32)   -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. @@ -237,7 +237,7 @@ This feature requires a plugin which supports LLMNR. Otherwise, the setting has master string   -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. @@ -339,7 +339,7 @@ This property is deprecated since version 1.44.This property is deprecated and h slave-type string   -Setting name of the device type of this slave's master connection (eg, "bond"), or NULL if this connection is not a slave. +Setting name of the device type of this port's 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. @@ -3841,7 +3841,7 @@ If the "tc" setting is not present, NetworkManager doesn't touch the filters pre flags NMVlanFlags (uint32)   -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's 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's 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. diff --git a/docs/api/html/nm-settings-ifcfg-rh.html b/docs/api/html/nm-settings-ifcfg-rh.html index ad13a12a..bfdf1af0 100644 --- a/docs/api/html/nm-settings-ifcfg-rh.html +++ b/docs/api/html/nm-settings-ifcfg-rh.html @@ -133,8 +133,8 @@ BOOTPROTO=dhcp

    Bonding configuration:
    -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
    @@ -154,16 +154,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
    @@ -1522,7 +1522,7 @@ Example: ZONE=Work
     master
     MASTER, MASTER_UUID, TEAM_MASTER, TEAM_MASTER_UUID, BRIDGE, BRIDGE_UUID
      
    -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.
     
     
     slave-type
    diff --git a/docs/api/html/nm-settings-keyfile.html b/docs/api/html/nm-settings-keyfile.html
    index da6f08e4..7b751164 100644
    --- a/docs/api/html/nm-settings-keyfile.html
    +++ b/docs/api/html/nm-settings-keyfile.html
    @@ -159,8 +159,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
                 
    A sample configuration for a VLAN:
    diff --git a/docs/api/html/nm-settings-nmcli.html b/docs/api/html/nm-settings-nmcli.html
    index 435a4a69..e3551a8c 100644
    --- a/docs/api/html/nm-settings-nmcli.html
    +++ b/docs/api/html/nm-settings-nmcli.html
    @@ -140,7 +140,7 @@
     
     

    connection.autoconnect-slaves

    -

    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.

    Format: choice (NMSettingConnectionAutoconnectSlaves)

    @@ -239,7 +239,7 @@

    Alias: master

    -

    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.

    Format: string

    @@ -340,7 +340,7 @@

    Alias: slave-type

    -

    Setting name of the device type of this slave's master connection (eg, "bond"), or NULL if this connection is not a slave.

    +

    Setting name of the device type of this port's 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.

    Format: string

    @@ -5601,7 +5601,7 @@ Linux traffic control subsystem

    Alias: flags

    -

    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's 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's operating state). "mvrp" (0x8) (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.

    Format: flags (NMVlanFlags)

    diff --git a/docs/api/html/nmcli-examples.html b/docs/api/html/nmcli-examples.html index 0eae3ac6..1b4f30ed 100644 --- a/docs/api/html/nmcli-examples.html +++ b/docs/api/html/nmcli-examples.html @@ -195,42 +195,42 @@ B,DISPATCH

    -

    Example 8. Adding a bonding master and two slave connection profiles

    +

    Example 8. 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.


    -

    Example 9. Adding a team master and two slave connection profiles

    +

    Example 9. Adding a team controller and two port 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
    +
    $ 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: + by activating both ports:

    -
      $ nmcli con up Team1-slave1
    -  $ nmcli con up Team1-slave2
    +
      $ 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 @@ -239,19 +239,19 @@ B,DISPATCH


    -

    Example 10. Adding a bridge and two slave profiles

    +

    Example 10. 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.

    @@ -401,8 +401,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 --------------------------------------------------------------------------- @@ -491,8 +491,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 --------------------------------------------------------------------------- @@ -551,8 +551,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/docs/api/html/nmcli.html b/docs/api/html/nmcli.html index 94dbcece..0139ed6d 100644 --- a/docs/api/html/nmcli.html +++ b/docs/api/html/nmcli.html @@ -738,9 +738,9 @@
  • adsl

  • bluetooth

  • bond

  • -
  • bond-slave (deprecated for ethernet with master)

  • +
  • bond-slave (deprecated for ethernet with controller)

  • bridge

  • -
  • bridge-slave (deprecated for ethernet with master)

  • +
  • bridge-slave (deprecated for ethernet with controller)

  • cdma

  • dummy

  • generic

  • @@ -757,7 +757,7 @@
  • ovs-port

  • pppoe

  • team

  • -
  • team-slave (deprecated for ethernet with master)

  • +
  • team-slave (deprecated for ethernet with controller)

  • tun

  • veth

  • vlan

  • diff --git a/docs/api/html/settings-connection.html b/docs/api/html/settings-connection.html index 50df7813..7ca59cc0 100644 --- a/docs/api/html/settings-connection.html +++ b/docs/api/html/settings-connection.html @@ -97,7 +97,7 @@ Depending on "connection.multi-connect", a profile can (auto)connect only once a
    autoconnect-slaves
    NMSettingConnectionAutoconnectSlaves (int32)
    
    -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.
     
    @@ -165,7 +165,7 @@ This feature requires a plugin which supports LLMNR. Otherwise, the setting has
     
    master
    string
    
    -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.
     
    @@ -255,7 +255,7 @@ At this time only the "user" [type] is allowed.  Any other values are ignored an
     
    slave-type
    string
    
    -Setting name of the device type of this slave's master connection (eg, "bond"), or NULL if this connection is not a slave.
    +Setting name of the device type of this port's 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.
     
    diff --git a/docs/api/html/settings-vlan.html b/docs/api/html/settings-vlan.html
    index 9371e4eb..28e3da69 100644
    --- a/docs/api/html/settings-vlan.html
    +++ b/docs/api/html/settings-vlan.html
    @@ -63,7 +63,7 @@
     
    flags
    NMVlanFlags (uint32)
    
    -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's 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's 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.
     
    diff --git a/docs/libnm/html/NMActiveConnection.html b/docs/libnm/html/NMActiveConnection.html
    index 2c9c5215..4e49ea67 100644
    --- a/docs/libnm/html/NMActiveConnection.html
    +++ b/docs/libnm/html/NMActiveConnection.html
    @@ -663,7 +663,7 @@ nm_active_connection_get_master (nm_active_connection_get_master has been deprecated since version 1.44 and should not be used in newly-written code.

    Use nm_active_connection_get_controller() instead.

    -

    Gets the master NMDevice of the connection.

    +

    Gets the controller NMDevice of the connection.

    Parameters

    @@ -681,7 +681,7 @@ nm_active_connection_get_master (

    Returns

    -

    the master NMDevice of the NMActiveConnection.

    +

    the controller NMDevice of the NMActiveConnection.

    [transfer none]

    @@ -1111,7 +1111,7 @@ nm_active_connection_get_vpn (

    The “master” property

      “master”                   NMDevice *
    -

    The master device if one exists. Replaced by the "controller" property.

    +

    The controller device if one exists. Replaced by the "controller" property.

    NMActiveConnection:master has been deprecated since version 1.44 and should not be used in newly-written code.

    Owner: NMActiveConnection

    Flags: Read

    diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html index c7cbf68c..7d8b88a5 100644 --- a/docs/libnm/html/NMDevice.html +++ b/docs/libnm/html/NMDevice.html @@ -1283,7 +1283,7 @@ nm_device_get_ports (

    Returns

    the GPtrArray containing NMDevices that -are slaves of device +are ports of device . This is the internal copy used by the device and must not be modified.

    [element-type NMDevice]

    diff --git a/docs/libnm/html/NMDeviceBond.html b/docs/libnm/html/NMDeviceBond.html index 50f4fbfa..3b6e1faa 100644 --- a/docs/libnm/html/NMDeviceBond.html +++ b/docs/libnm/html/NMDeviceBond.html @@ -195,7 +195,7 @@ nm_device_bond_get_slaves (nm_device_bond_get_slaves has been deprecated since version 1.34 and should not be used in newly-written code.

    Use nm_device_get_ports() instead.

    -

    Gets the devices currently enslaved to device +

    Gets the devices currently attached as port to device .

    Parameters

    @@ -261,7 +261,7 @@ copy used by the device, and must not be modified.

    The “slaves” property

      “slaves”                   GPtrArray *
    -

    The devices enslaved to the bond device.

    +

    The devices attached as port to the bond device.

    [type GPtrArray(NMDevice)]

    Owner: NMDeviceBond

    Flags: Read

    diff --git a/docs/libnm/html/NMDeviceBridge.html b/docs/libnm/html/NMDeviceBridge.html index 83ea42bc..f0be9f43 100644 --- a/docs/libnm/html/NMDeviceBridge.html +++ b/docs/libnm/html/NMDeviceBridge.html @@ -195,7 +195,7 @@ nm_device_bridge_get_slaves (nm_device_bridge_get_slaves has been deprecated since version 1.34 and should not be used in newly-written code.

    Use nm_device_get_ports() instead.

    -

    Gets the devices currently enslaved to device +

    Gets the devices currently attached as port to device .

    Parameters

    @@ -215,7 +215,7 @@ nm_device_bridge_get_slaves (

    Returns

    the GPtrArray containing -NMDevices that are slaves of device +NMDevices that are ports of device . This is the internal copy used by the device, and must not be modified.

    [element-type NMDevice]

    @@ -261,7 +261,7 @@ copy used by the device, and must not be modified.

    The “slaves” property

      “slaves”                   GPtrArray *
    -

    The devices enslaved to the bridge device.

    +

    The devices attached as port to the bridge device.

    [type GPtrArray(NMDevice)]

    Owner: NMDeviceBridge

    Flags: Read

    diff --git a/docs/libnm/html/NMDeviceOvsBridge.html b/docs/libnm/html/NMDeviceOvsBridge.html index cf296576..80f54539 100644 --- a/docs/libnm/html/NMDeviceOvsBridge.html +++ b/docs/libnm/html/NMDeviceOvsBridge.html @@ -105,7 +105,7 @@ nm_device_ovs_bridge_get_slaves (nm_device_ovs_bridge_get_slaves has been deprecated since version 1.34 and should not be used in newly-written code.

    Use nm_device_get_ports() instead.

    -

    Gets the ports currently enslaved to device +

    Gets the ports currently attached as port to device .

    Parameters

    @@ -125,7 +125,7 @@ nm_device_ovs_bridge_get_slaves (

    Returns

    the GPtrArray containing -NMDevices that are slaves of device +NMDevices that are ports of device . This is the internal copy used by the device, and must not be modified.

    [element-type NMDevice]

    @@ -152,7 +152,7 @@ copy used by the device, and must not be modified.

    The “slaves” property

      “slaves”                   GPtrArray *
    -

    Gets the ports currently enslaved to the device.

    +

    Gets the ports currently attached as port to the device.

    [type GPtrArray(NMDevice)]

    Owner: NMDeviceOvsBridge

    Flags: Read

    diff --git a/docs/libnm/html/NMDeviceOvsPort.html b/docs/libnm/html/NMDeviceOvsPort.html index dcd25db2..e664afb7 100644 --- a/docs/libnm/html/NMDeviceOvsPort.html +++ b/docs/libnm/html/NMDeviceOvsPort.html @@ -105,7 +105,7 @@ nm_device_ovs_port_get_slaves (nm_device_ovs_port_get_slaves has been deprecated since version 1.34 and should not be used in newly-written code.

    Use nm_device_get_ports() instead.

    -

    Gets the interfaces currently enslaved to device +

    Gets the interfaces currently attached as port to device .

    Parameters

    @@ -125,7 +125,7 @@ nm_device_ovs_port_get_slaves (

    Returns

    the GPtrArray containing -NMDevices that are slaves of device +NMDevices that are ports of device . This is the internal copy used by the device, and must not be modified.

    [element-type NMDevice]

    @@ -152,7 +152,7 @@ copy used by the device, and must not be modified.

    The “slaves” property

      “slaves”                   GPtrArray *
    -

    Gets the interfaces currently enslaved to the device.

    +

    Gets the interfaces currently attached as port to the device.

    [type GPtrArray(NMDevice)]

    Owner: NMDeviceOvsPort

    Flags: Read

    diff --git a/docs/libnm/html/NMDeviceTeam.html b/docs/libnm/html/NMDeviceTeam.html index 84bae898..593166dc 100644 --- a/docs/libnm/html/NMDeviceTeam.html +++ b/docs/libnm/html/NMDeviceTeam.html @@ -212,7 +212,7 @@ nm_device_team_get_slaves (nm_device_team_get_slaves has been deprecated since version 1.34 and should not be used in newly-written code.

    Use nm_device_get_ports() instead.

    -

    Gets the devices currently enslaved to device +

    Gets the devices currently attach as port to device .

    Parameters

    @@ -232,7 +232,7 @@ nm_device_team_get_slaves (

    Returns

    the GPtrArray containing -NMDevices that are slaves of device +NMDevices that are ports of device . This is the internal copy used by the device, and must not be modified.

    [element-type NMDevice]

    @@ -322,7 +322,7 @@ device, and must not be modified.

    The “slaves” property

      “slaves”                   GPtrArray *
    -

    The devices enslaved to the team device.

    +

    The devices attached as port to the team device.

    [type GPtrArray(NMDevice)]

    Owner: NMDeviceTeam

    Flags: Read

    diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html index 2620fe0f..8d79934b 100644 --- a/docs/libnm/html/NMSettingConnection.html +++ b/docs/libnm/html/NMSettingConnection.html @@ -1197,7 +1197,7 @@ is just an alias.

    Returns

    -

    interface name of the master device or UUID of the master +

    interface name of the controller device or UUID of the controller connection.

    @@ -1254,7 +1254,7 @@ nm_setting_connection_is_slave_type (

    type

    +'s port type

    @@ -1262,7 +1262,7 @@ against setting

    Returns

    -

    TRUE if connection is of the given slave type +

    TRUE if connection is of the given port type

    @@ -1294,7 +1294,7 @@ is just an alias.

    Returns

    -

    the type of slave this connection is, if any

    +

    the type of port this connection is, if any


    @@ -1353,7 +1353,7 @@ is just an alias.

    Returns

    -

    whether slaves of the connection should be activated together +

    whether ports of the connection should be activated together with the connection.

    Since: 1.2

    @@ -2101,7 +2101,7 @@ property.

    enum NMSettingConnectionAutoconnectSlaves

    NMSettingConnectionAutoconnectSlaves has been deprecated since version 1.46 and should not be used in newly-written code.

    NMSettingConnectionAutoconnectSlaves values indicate whether slave connections -should be activated when master is activated.

    +should be activated when controller is activated.

    Members

    the setting name (ie NM_SETTING_BOND_SETTING_NAME) to be matched against setting -'s slave type

     
    @@ -2122,7 +2122,7 @@ should be activated when master is activated.

    @@ -2130,7 +2130,7 @@ master is activated

    diff --git a/docs/libnm/html/NMSettingTeam.html b/docs/libnm/html/NMSettingTeam.html index eaa62d32..82d73897 100644 --- a/docs/libnm/html/NMSettingTeam.html +++ b/docs/libnm/html/NMSettingTeam.html @@ -1011,7 +1011,7 @@ going down and the runner being notified about it.

    nm_team_link_watcher_get_init_wait ()

    int
     nm_team_link_watcher_get_init_wait (const NMTeamLinkWatcher *watcher);
    -

    Gets the init_wait interval (in milliseconds) that the team slave should +

    Gets the init_wait interval (in milliseconds) that the team port should wait before sending the first packet to the target host.

    Parameters

    @@ -1035,7 +1035,7 @@ wait before sending the first packet to the target host.

    nm_team_link_watcher_get_interval ()

    int
     nm_team_link_watcher_get_interval (const NMTeamLinkWatcher *watcher);
    -

    Gets the interval (in milliseconds) that the team slave should wait between +

    Gets the interval (in milliseconds) that the team port should wait between sending two check packets to the target host.

    Parameters

    diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html index dd29e8a6..39fa0e7b 100644 --- a/docs/libnm/html/api-index-full.html +++ b/docs/libnm/html/api-index-full.html @@ -225,6 +225,10 @@
    +NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES, macro in nm-dbus-interface +
    +
    +
    NMActiveConnection, struct in NMActiveConnection
    diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html index ad68de63..db1ea997 100644 --- a/docs/libnm/html/index.html +++ b/docs/libnm/html/index.html @@ -15,7 +15,7 @@

    NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_NO

    slaves are not brought up when -master is activated

    +controller is activated

     

    NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_YES

    slaves are brought up when -master is activated

    +controller is activated

     

    - for libnm 1.48.6 + for libnm 1.48.8 The latest version of this documentation can be found on-line at https://networkmanager.dev/docs/libnm/latest/. diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html index 0e1ca808..0a3867ad 100644 --- a/docs/libnm/html/libnm-nm-dbus-interface.html +++ b/docs/libnm/html/libnm-nm-dbus-interface.html @@ -493,6 +493,10 @@ NMActivationStateFlags +#define +NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES + + enum NMSettingsAddConnection2Flags @@ -1270,7 +1274,7 @@ GSM/UMTS, or LTE network access protocols

    NM_DEVICE_TYPE_BOND

    -

    a bond master interface

    +

    a bond controller interface

      @@ -1291,7 +1295,7 @@ GSM/UMTS, or LTE network access protocols

    NM_DEVICE_TYPE_BRIDGE

    -

    a bridge master interface

    +

    a bridge controller interface

      @@ -1305,7 +1309,7 @@ GSM/UMTS, or LTE network access protocols

    NM_DEVICE_TYPE_TEAM

    -

    a team master interface

    +

    a team controller interface

      @@ -3622,16 +3626,16 @@ an external configuration of a networking device. Since: 1.26.

      -

    NM_ACTIVATION_STATE_FLAG_IS_MASTER

    +

    NM_ACTIVATION_STATE_FLAG_IS_CONTROLLER

    -

    the device is a master.

    +

    the device is a controller.

      -

    NM_ACTIVATION_STATE_FLAG_IS_SLAVE

    +

    NM_ACTIVATION_STATE_FLAG_IS_PORT

    -

    the device is a slave.

    +

    the device is a port.

      @@ -3657,10 +3661,10 @@ an external configuration of a networking device. Since: 1.26.

      -

    NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES

    +

    NM_ACTIVATION_STATE_FLAG_CONTROLLER_HAS_PORTS

    -

    The master has any slave devices attached. -This only makes sense if the device is a master.

    +

    The controller has any port devices attached. +This only makes sense if the device is a controller.

      @@ -3689,6 +3693,12 @@ represent an external configuration of a networking device. Since: 1.26.


    +

    NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES

    +
    #define NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES NM_ACTIVATION_FLAG_CONTROLLER_HAS_PORTS
    +
    +
    +
    +

    enum NMSettingsAddConnection2Flags

    Numeric flags for the "flags" argument of AddConnection2() D-Bus API.

    diff --git a/docs/libnm/html/libnm-nm-utils.html b/docs/libnm/html/libnm-nm-utils.html index bf01858f..f14b001d 100644 --- a/docs/libnm/html/libnm-nm-utils.html +++ b/docs/libnm/html/libnm-nm-utils.html @@ -2706,10 +2706,10 @@ general case) work with connections of type other_ty other_type is a valid type for the parent of a VLAN.

    If virtual_type - is a "master" type (eg, NM_TYPE_SETTING_BRIDGE), + is a "controller" type (eg, NM_TYPE_SETTING_BRIDGE), then this checks if other_type - is a valid type for a slave of that -master.

    + is a valid type for a port of that +controller.

    Note that even if this returns TRUE it is not guaranteed that every connection of type other_type is diff --git a/docs/libnm/html/libnm-nm-version-macros.html b/docs/libnm/html/libnm-nm-version-macros.html index aa3f6e90..4ea9a41e 100644 --- a/docs/libnm/html/libnm-nm-version-macros.html +++ b/docs/libnm/html/libnm-nm-version-macros.html @@ -269,7 +269,7 @@ is compiled against.


    NM_MICRO_VERSION

    -
    #define NM_MICRO_VERSION (6)
    +
    #define NM_MICRO_VERSION (8)
     

    Evaluates to the micro version number of NetworkManager which this source compiled against.

    diff --git a/docs/libnm/html/libnm.devhelp2 b/docs/libnm/html/libnm.devhelp2 index 71a1a7e9..070c0df1 100644 --- a/docs/libnm/html/libnm.devhelp2 +++ b/docs/libnm/html/libnm.devhelp2 @@ -510,6 +510,7 @@ + @@ -3867,12 +3868,12 @@ - - + + - + diff --git a/docs/libnm/html/usage.html b/docs/libnm/html/usage.html index 2f493595..47743c6e 100644 --- a/docs/libnm/html/usage.html +++ b/docs/libnm/html/usage.html @@ -96,7 +96,7 @@

    $ cc $(pkg-config --libs --cflags libnm) -o hello-nm hello-nm.c
       $ ./hello-nm
    -  NetworkManager version: 1.48.6
    +  NetworkManager version: 1.48.8
     
       $ 

    -- cgit 1.3.0-6-gf8a5