From: Dimitri John Ledkov <19779+xnox@users.noreply.github.com> Date: Thu, 22 Apr 2021 13:22:50 +0000 (+0100) Subject: Merge pull request #19346 from mihajlov/dhcp_broadcast_l3 X-Git-Tag: v249-rc1~358 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a25100488be63cc5a78173553194c5bead32afb9;p=thirdparty%2Fsystemd.git Merge pull request #19346 from mihajlov/dhcp_broadcast_l3 network: enable DHCP broadcast flag if required by interface --- a25100488be63cc5a78173553194c5bead32afb9 diff --cc src/network/networkd-network.c index 239cb1e7cba,bd363b7bd64..9833722f71a --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@@ -309,12 -353,22 +309,13 @@@ int network_load_one(Manager *manager, .dhcp_use_hostname = true, .dhcp_use_routes = true, .dhcp_use_gateway = -1, - /* NOTE: this var might be overwritten by network_apply_anonymize_if_set */ .dhcp_send_hostname = true, .dhcp_send_release = true, - /* To enable/disable RFC7844 Anonymity Profiles */ - .dhcp_anonymize = false, .dhcp_route_metric = DHCP_ROUTE_METRIC, - /* NOTE: this var might be overwritten by network_apply_anonymize_if_set */ - .dhcp_client_identifier = DHCP_CLIENT_ID_DUID, + .dhcp_client_identifier = _DHCP_CLIENT_ID_INVALID, .dhcp_route_table = RT_TABLE_MAIN, - .dhcp_route_table_set = false, - /* NOTE: from man: UseMTU=... Defaults to false*/ - .dhcp_use_mtu = false, - /* NOTE: from man: UseTimezone=... Defaults to "no".*/ - .dhcp_use_timezone = false, .dhcp_ip_service_type = -1, + .dhcp_broadcast = -1, .dhcp6_use_address = true, .dhcp6_use_dns = true,