diff options
| author | Francesco Giudici <fgiudici@redhat.com> | 2019-04-09 11:41:27 +0200 |
|---|---|---|
| committer | Francesco Giudici <fgiudici@redhat.com> | 2019-04-09 11:41:27 +0200 |
| commit | 5ca3888861d4f05935c9f330804c1f30ab8c57e5 (patch) | |
| tree | bb2a3dccdc9b00d76a7a9e01e0ca6e200a3e917c | |
| parent | 80a3031a7c40f9b6f2ff08b924077e5c1d09a8b7 (diff) | |
| download | NetworkManager-fg/internal-dhcp-client-id-default-legacy_rh1695723.tar.gz | |
dhcp/internal: make default dhcp-client-id based on systemd DUID-ENfg/internal-dhcp-client-id-default-legacy_rh1695723
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.
| -rw-r--r-- | src/dhcp/nm-dhcp-manager.c | 2 | ||||
| -rw-r--r-- | 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 7063c82cfa..4a40d2e526 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 70ed871503..84973aa2a8 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; } |