From 2481eaac156515677f2edc8f585d10e0474eb6f1 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 10 Nov 2016 14:08:16 +0100 Subject: [PATCH] man: clarify HWADDR for nm-setting-ifcfg-rh manual --- libnm-core/nm-setting-infiniband.c | 5 ++++- libnm-core/nm-setting-wired.c | 3 +++ libnm-core/nm-setting-wireless.c | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libnm-core/nm-setting-infiniband.c b/libnm-core/nm-setting-infiniband.c index 6086f0765b..f0856ee79f 100644 --- a/libnm-core/nm-setting-infiniband.c +++ b/libnm-core/nm-setting-infiniband.c @@ -406,7 +406,10 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class) * property: mac-address * variable: HWADDR * description: IBoIP 20-byte hardware address of the device (in traditional - * hex-digits-and-colons notation). + * hex-digits-and-colons notation). + * Note that for initscripts this is the current MAC address of the device as found + * during ifup. For NetworkManager this is the permanent MAC address. Or in case no + * permanent MAC address exists, the MAC address initially configured on the device. * example: HWADDR=01:02:03:04:05:06:07:08:09:0A:01:02:03:04:05:06:07:08:09:11 * ---end--- */ diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c index 61df4bdfaf..b27643d9a1 100644 --- a/libnm-core/nm-setting-wired.c +++ b/libnm-core/nm-setting-wired.c @@ -1072,6 +1072,9 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_wired_class) * variable: HWADDR * description: Hardware address of the device in traditional hex-digits-and-colons * notation (e.g. 00:22:68:14:5A:05). + * Note that for initscripts this is the current MAC address of the device as found + * during ifup. For NetworkManager this is the permanent MAC address. Or in case no + * permanent MAC address exists, the MAC address initially configured on the device. * ---end--- */ g_object_class_install_property diff --git a/libnm-core/nm-setting-wireless.c b/libnm-core/nm-setting-wireless.c index a31f7586d2..e5df0f1221 100644 --- a/libnm-core/nm-setting-wireless.c +++ b/libnm-core/nm-setting-wireless.c @@ -1321,6 +1321,9 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_wireless_class) * variable: HWADDR * description: Hardware address of the device in traditional hex-digits-and-colons * notation (e.g. 00:22:68:14:5A:05). + * Note that for initscripts this is the current MAC address of the device as found + * during ifup. For NetworkManager this is the permanent MAC address. Or in case no + * permanent MAC address exists, the MAC address initially configured on the device. * ---end--- */ g_object_class_install_property