From c63d39ed73da9cd804e7ace3b11debb49ed5f6b4 Mon Sep 17 00:00:00 2001 From: Francesco Giudici Date: Tue, 9 Apr 2019 11:41:27 +0200 Subject: [PATCH] dhcp/internal: make default dhcp-client-id based on systemd DUID-EN For RHEL-7 we want to stick to the legacy behavior of the internal dhcp client: the default dhcp-client-id is based on systemd DUID-EN. https://bugzilla.redhat.com/show_bug.cgi?id=1695723 This reverts commit cfd696cc3cf43f5f510046b757949546bcee4cdc. --- src/dhcp/nm-dhcp-manager.c | 2 +- src/dhcp/nm-dhcp-systemd.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/dhcp/nm-dhcp-manager.c b/src/dhcp/nm-dhcp-manager.c index fe843a2ce43c..b998bf465b25 100644 --- a/src/dhcp/nm-dhcp-manager.c +++ b/src/dhcp/nm-dhcp-manager.c @@ -237,7 +237,7 @@ client_start (NMDhcpManager *self, * * - for IPv4, the calling code may determine a client-id (from NM's connection profile). * If present, it is taken. If not present, the DHCP plugin uses a plugin specific default. - * - for "internal" plugin, the default is just "mac". + * - for "internal" plugin, the default is just "duid". * - for "dhclient", we try to get the configuration from dhclient's /etc/dhcp or fallback * to whatever dhclient uses by default. * We do it this way, because for dhclient the user may configure a default diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/dhcp/nm-dhcp-systemd.c index 1cd5ba278283..b6344d9bbf9c 100644 --- a/src/dhcp/nm-dhcp-systemd.c +++ b/src/dhcp/nm-dhcp-systemd.c @@ -750,7 +750,8 @@ ip4_start (NMDhcpClient *client, client_id = nm_dhcp_client_get_client_id (client); if (!client_id) { - client_id_new = nm_utils_dhcp_client_id_mac (arp_type, hwaddr_arr, hwaddr_len); + client_id_new = nm_utils_dhcp_client_id_systemd_node_specific (TRUE, + nm_dhcp_client_get_iface (client)); client_id = client_id_new; } -- 2.21.0