From efdb62dfd04f92a7714777046fd1ba68a84c9f63 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 28 May 2019 05:45:10 +0900 Subject: [PATCH] network: do not send DHCPRELEASE when CriticalConnection= is enabled --- src/network/networkd-dhcp4.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c index 8bcd345731e..4ed020ea8e5 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -649,15 +649,28 @@ static int dhcp4_handler(sd_dhcp_client *client, int event, void *userdata) { return log_link_warning_errno(link, r, "Could not acquire IPv4 link-local address: %m"); } + if (link->network->dhcp_critical) { + log_link_notice(link, "DHCPv4 connection considered critical, ignoring request to reconfigure it."); + return 0; + } + if (link->network->dhcp_send_release) (void) sd_dhcp_client_send_release(client); - _fallthrough_; + if (link->dhcp_lease) { + r = dhcp_lease_lost(link); + if (r < 0) { + link_enter_failed(link); + return r; + } + } + + break; case SD_DHCP_CLIENT_EVENT_EXPIRED: case SD_DHCP_CLIENT_EVENT_IP_CHANGE: if (link->network->dhcp_critical) { - log_link_notice(link, "DHCPv4 connection considered system critical, ignoring request to reconfigure it."); + log_link_notice(link, "DHCPv4 connection considered critical, ignoring request to reconfigure it."); return 0; } -- 2.47.3