From bcd554724e796a482df5c54ebdafb97d6e81b10e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sch=C3=A4fer?= Date: Thu, 17 Jul 2014 15:50:21 -0500 Subject: [PATCH] dhcp: let dhclient handle requesting the 'server-id' option Always requesting this appears to cause some devices to ignore DHCP requests, like the ZTE 823D, ZTEMF93E, Alcatel W800Z. dhclient probably knows better than NM when to request the server's ID, so leave that up to dhclient. We don't do anything interesting with it anyway. --- src/dhcp-manager/nm-dhcp-dhclient-utils.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/dhcp-manager/nm-dhcp-dhclient-utils.c b/src/dhcp-manager/nm-dhcp-dhclient-utils.c index 8527e6c0f..bc9de12bd 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient-utils.c +++ b/src/dhcp-manager/nm-dhcp-dhclient-utils.c @@ -225,7 +225,6 @@ nm_dhcp_dhclient_create_config (const char *interface, add_also_request (alsoreq, "dhcp6.name-servers"); add_also_request (alsoreq, "dhcp6.domain-search"); add_also_request (alsoreq, "dhcp6.client-id"); - add_also_request (alsoreq, "dhcp6.server-id"); } else { add_ip4_config (new_contents, dhcp_client_id, hostname); add_also_request (alsoreq, "rfc3442-classless-static-routes");