fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-06 03:50:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ifcfg: introduce DHCPV6_DUID to map ipv6.dhcp-duid property

Browse source
This commit is contained in:
Francesco Giudici 2018-04-06 18:25:06 +02:00
parent e9321713a9
commit f913ed4d0c
3 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libnm-core/nm-setting-ip6-config.c
View file

@ -866,6 +866,16 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *ip6_class)
*
* Since: 1.12
**/
/* ---ifcfg-rh---
* property: dhcp-duid
* variable: DHCPV6_DUID(+)
* description: A string sent to the DHCPv6 server to identify the local machine.
* Apart from the special values "lease", "stable-llt", "stable-ll", "stable-uuid",
* "llt" and "ll" a binary value in hex format is expected. An hex string where
* each octet is separated by a colon is also accepted.
* example: DHCPV6_DUID=LL; DHCPV6_DUID=0301deadbeef0001; DHCPV6_DUID=03:01:de:ad:be:ef:00:01
* ---end---
*/
g_object_class_install_property
(object_class, PROP_DHCP_DUID,
g_param_spec_string (NM_SETTING_IP6_CONFIG_DHCP_DUID, "", "",

5
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
View file

@ -1823,6 +1823,11 @@ make_ip6_setting (shvarFile *ifcfg,
if (strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_IGNORE) == 0)
return NM_SETTING (s_ip6);
nm_clear_g_free (&value);
v = svGetValueStr (ifcfg, "DHCPV6_DUID", &value);
if (v)
g_object_set (s_ip6, NM_SETTING_IP6_CONFIG_DHCP_DUID, v, NULL);
nm_clear_g_free (&value);
v = svGetValueStr (ifcfg, "DHCPV6_HOSTNAME", &value);
/* Use DHCP_HOSTNAME as fallback if it is in FQDN format and ipv6.method is

4
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
View file

@ -2568,6 +2568,7 @@ write_ip6_setting (NMConnection *connection,
svUnsetValue (ifcfg, "IPV6INIT");
svUnsetValue (ifcfg, "IPV6_AUTOCONF");
svUnsetValue (ifcfg, "DHCPV6C");
svUnsetValue (ifcfg, "DHCPv6_DUID");
svUnsetValue (ifcfg, "DHCPV6_HOSTNAME");
svUnsetValue (ifcfg, "DHCPV6_SEND_HOSTNAME");
svUnsetValue (ifcfg, "IPV6_DEFROUTE");
@ -2608,6 +2609,9 @@ write_ip6_setting (NMConnection *connection,
svUnsetValue (ifcfg, "DHCPV6C");
}
svSetValueStr (ifcfg, "DHCPV6_DUID",
nm_setting_ip6_config_get_dhcp_duid (NM_SETTING_IP6_CONFIG (s_ip6)));
write_ip6_setting_dhcp_hostname (s_ip6, ifcfg);
/* Write out IP addresses */