Commit bb539765 authored by Martin Pitt's avatar Martin Pitt

networkd: Fix stopping v4 dhcpclient when the carrier is lost

This is fixed upstream in 217 and later.

Thanks Christos Trochalakis!

Closes: #779571
parent 2800ab31
......@@ -5,6 +5,8 @@ systemd (215-13) UNRELEASED; urgency=medium
jessie; the next Debian release will enable timesyncd by default).
(Closes: #755722)
* Check for correct architecture identifiers for SuperH. (Closes: #779710)
* networkd: Fix stopping v4 dhcpclient when the carrier is lost. Thanks
Christos Trochalakis! (Closes: #779571)
-- Martin Pitt <mpitt@debian.org> Mon, 16 Feb 2015 16:11:12 +0100
......
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Sat, 7 Feb 2015 09:23:19 +0200
Subject: networkd: link - fix stopping v4 dhcpclient when the carrier is lost
The check for a running v4 dhcpclient was using DHCP_SUPPORT_V6 flag
instead of DHCP_SUPPORT_V4.
As a result, when the carrier was lost systemd was not cleaning up the
relevant addresses and routes. If the carrier was regained in another
environment, with a different subnet and gateway, the system would end
up with multiple addresses and default gateways and thus a broken
network configuration. This scenario can be easily reproduced with wifi
links.
Bug-Debian: http://bugs.debian.org/779571
Forwarded: No, fixed upstream in 217 as side effect of commit ba179154.
---
src/network/networkd-link.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 6257372..8c68199 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -206,7 +206,7 @@ static int link_stop_clients(Link *link) {
if (!link->network)
return 0;
- if (IN_SET(link->network->dhcp, DHCP_SUPPORT_BOTH, DHCP_SUPPORT_V6)) {
+ if (IN_SET(link->network->dhcp, DHCP_SUPPORT_BOTH, DHCP_SUPPORT_V4)) {
assert(link->dhcp_client);
k = sd_dhcp_client_stop(link->dhcp_client);
......@@ -136,6 +136,7 @@ logind-fix-sd_eviocrevoke-ioctl-call.patch
rules-Fix-by-path-of-mmc-RPMB-partitions-and-don-t-b.patch
man-document-failed.patch
Use-correct-uname-identifiers-in-arch_map-for-SuperH.patch
networkd-link-fix-stopping-v4-dhcpclient-when-the-ca.patch
## Debian specific patches:
Add-back-support-for-Debian-specific-config-files.patch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment