summaryrefslogtreecommitdiff
path: root/man/NetworkManager.conf.xml
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-06-15 11:25:29 +0200
committerThomas Haller <thaller@redhat.com>2016-06-30 08:29:55 +0200
commit481cdc2706ae9467ca4a2527463e26c539e49e24 (patch)
treedbb82b4b86e5cb2f89362a0c3f8be6766fbede4c /man/NetworkManager.conf.xml
parentda3f608802e9850c885e3ad96cec4fd97a75bbab (diff)
downloadNetworkManager-481cdc2706ae9467ca4a2527463e26c539e49e24.tar.gz
device: let device specs match on permanent MAC address
Using the current, possibly non-permanent MAC address doesn't really make sense. Also, NM_DEVICE_HW_ADDRESS used to be writable and was set by NMDeviceBt to the bdaddr. That is wrong, because bdaddr should not be the current address, but the permanent one.
Diffstat (limited to 'man/NetworkManager.conf.xml')
-rw-r--r--man/NetworkManager.conf.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 9f5906efed..b70438ded3 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -1042,7 +1042,7 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16
</varlistentry>
<varlistentry>
<term>HWADDR</term>
- <listitem><para>Match the MAC address of the device. Globbing is not supported</para></listitem>
+ <listitem><para>Match the permanent MAC address of the device. Globbing is not supported</para></listitem>
</varlistentry>
<varlistentry>
<term>interface-name:IFNAME</term>
@@ -1057,7 +1057,7 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16
</varlistentry>
<varlistentry>
<term>mac:HWADDR</term>
- <listitem><para>Match the MAC address of the device. Globbing is not supported</para></listitem>
+ <listitem><para>Match the permanent MAC address of the device. Globbing is not supported</para></listitem>
</varlistentry>
<varlistentry>
<term>s390-subchannels:HWADDR</term>