From 5c3e7c4a3b23f3f27103bd87c84333b9e20db2a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20=C3=96lmann?= Date: Mon, 6 Sep 2021 21:54:04 +0200 Subject: [PATCH 1/2] man/systemd.netdev: fix typos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ulrich Ölmann --- man/systemd.netdev.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index f62b4cb4004..6db53348114 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -317,10 +317,10 @@ The MAC address to use for the device. For tun or tap devices, setting MACAddress= in the [NetDev] section is not - supported. Please specify it in [Link] section of the corresponding + supported. Please specify it in the [Link] section of the corresponding systemd.network5 file. If this option is not set, vlan devices inherit the MAC address of the - physical interface. For other kind of netdevs, if this option is not set, then MAC address is + physical interface. For other kind of netdevs, if this option is not set, then the MAC address is generated based on the interface name and the machine-id5. From 489f01f806f865eabb55458c98182b06a6c53a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20=C3=96lmann?= Date: Mon, 6 Sep 2021 22:10:30 +0200 Subject: [PATCH 2/2] man/systemd.netdev: adjust documentation of MAC addresses for bridges In the past bridge devices used to be created with a generated MAC address thwarting the inheritance of the first slave's MAC address. This has been changed by commit [1] some time ago. Reflect that behavioral change in the documentation. [1] deb2cfa4c688 ("networkd: do not generate MAC for bridge device.") --- man/systemd.netdev.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index 6db53348114..dd5cc1bfe9d 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -319,9 +319,10 @@ devices, setting MACAddress= in the [NetDev] section is not supported. Please specify it in the [Link] section of the corresponding systemd.network5 - file. If this option is not set, vlan devices inherit the MAC address of the - physical interface. For other kind of netdevs, if this option is not set, then the MAC address is - generated based on the interface name and the + file. If this option is not set, bridge and vlan devices + inherit the MAC address of the first slave device or the physical interface, respectively. For other + kind of netdevs, if this option is not set, then the MAC address is generated based on the interface + name and the machine-id5.