summaryrefslogtreecommitdiff
path: root/man/systemd.netdev.xml
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2021-11-08 11:36:09 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2021-11-28 12:04:55 +0900
commit5b8bdd20c621dd1a34d4e5b200ef9ea1711bfb14 (patch)
treedbda929bbaa42b29ff1a58f14a055dd2b0a8a82e /man/systemd.netdev.xml
parentaaa5ca57ae073bfc72bc77ca797fd23579d1e185 (diff)
downloadsystemd-5b8bdd20c621dd1a34d4e5b200ef9ea1711bfb14.tar.gz
network/netdev: generate persistent MAC address for batadv and bridge
This mostly reverts 489f01f806f865eabb55458c98182b06a6c53a62 and deb2cfa4c6885d448eb1f17e5ef1b139106b7e86. As now MACAddress=none is supported. So, users can still disable MAC address assignment.
Diffstat (limited to 'man/systemd.netdev.xml')
-rw-r--r--man/systemd.netdev.xml7
1 files changed, 3 insertions, 4 deletions
diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index 133c6fcc63..bd493a8c53 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -261,10 +261,9 @@
devices, the <varname>MACAddress=</varname> setting in the [NetDev] section is not
supported and will be ignored. Please specify it in the [Link] section of the corresponding
<citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>
- file. If this option is not set, <literal>bridge</literal> and <literal>vlan</literal> 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
+ file. If this option is not set, <literal>vlan</literal> device inherits the MAC address of
+ the master 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
<citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
</para>
<para>Note, even if <literal>none</literal> is specified, <command>systemd-udevd</command>