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