summaryrefslogtreecommitdiff
path: root/libnm-core/nm-setting-wired.c
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2017-07-25 10:37:14 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2017-07-26 14:05:38 +0200
commit2f4dfd0f2e8f85dd86f5abfbeaafd7cb04655525 (patch)
tree789827fdd41a133f6ff241107a9ae55de6cb6b07 /libnm-core/nm-setting-wired.c
parent73824414330138441ea39198134dee24ff4db1ff (diff)
downloadNetworkManager-2f4dfd0f2e8f85dd86f5abfbeaafd7cb04655525.tar.gz
device: don't set a fake permanent hardware address
Software devices don't have a permanent hardware address and thus it doesn't make sense to enforce the 'fake' (generated) permanent one when cloned-mac-address=permanent. Also, setting the fake permanent address on bond devices, prevents them from inheriting the first slave hardware address, so let's just skip the setting of MAC when cloned-mac-address=permanent and there is no real permanent address. https://bugzilla.redhat.com/show_bug.cgi?id=1472965
Diffstat (limited to 'libnm-core/nm-setting-wired.c')
-rw-r--r--libnm-core/nm-setting-wired.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c
index 9dbae61450..44ae43bf6a 100644
--- a/libnm-core/nm-setting-wired.c
+++ b/libnm-core/nm-setting-wired.c
@@ -1150,7 +1150,8 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_wired_class)
* Beside explicitly specifying a MAC address, the special values "preserve", "permanent",
* "random" and "stable" are supported.
* "preserve" means not to touch the MAC address on activation.
- * "permanent" means to use the permanent hardware address of the device.
+ * "permanent" means to use the permanent hardware address if the device
+ * has one (otherwise this is treated as "preserve").
* "random" creates a random MAC address on each connect.
* "stable" creates a hashed MAC address based on connection.stable-id and a
* machine dependent key.