]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #19346 from mihajlov/dhcp_broadcast_l3
authorDimitri John Ledkov <19779+xnox@users.noreply.github.com>
Thu, 22 Apr 2021 13:22:50 +0000 (14:22 +0100)
committerGitHub <noreply@github.com>
Thu, 22 Apr 2021 13:22:50 +0000 (14:22 +0100)
network: enable DHCP broadcast flag if required by interface

1  2 
src/network/networkd-dhcp4.c
src/network/networkd-network-gperf.gperf
src/network/networkd-network.c
src/network/networkd-network.h

Simple merge
index 239cb1e7cba7dc3d0ffb2673e67731e031647a2e,bd363b7bd64db59e15b4d68b68bbb6bb92e95a61..9833722f71a2b80ebc0dbdd18b924f8f6074e158
@@@ -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,
Simple merge