|
 |
35bb946 |
From 14d3f593b115fb46361e5dab4de0bead8451ca27 Mon Sep 17 00:00:00 2001
|
|
|
35bb946 |
From: Susant Sahani <145210+ssahani@users.noreply.github.com>
|
|
|
35bb946 |
Date: Wed, 18 Oct 2017 16:08:56 +0530
|
|
|
35bb946 |
Subject: [PATCH] networkd: don't stop the dhcp server if it's not configured.
|
|
|
35bb946 |
(#7083)
|
|
|
35bb946 |
|
|
|
35bb946 |
we call sd_dhcp_server_stop even if it's not configured when link is
|
|
|
35bb946 |
down resulting unwanted logs.
|
|
|
35bb946 |
```
|
|
|
35bb946 |
Oct 10 13:41:07 nena systemd-networkd[126]: eth0: Lost carrier
|
|
|
35bb946 |
Oct 10 13:41:07 nena systemd-networkd[126]: DHCP CLIENT (0x560f2dc5): STOPPED
|
|
|
35bb946 |
Oct 10 13:41:07 nena systemd-networkd[126]: eth0: DHCP lease lost
|
|
|
35bb946 |
Oct 10 13:41:07 nena systemd-networkd[126]: NDISC: Stopping IPv6 Router Solicitation client
|
|
|
35bb946 |
Oct 10 13:41:07 nena systemd-networkd[126]: Assertion 'server' failed at ../src/libsystemd-network/sd-dhcp-server.c:256, function sd_dhcp_server_stop(). Ignoring.
|
|
|
35bb946 |
```
|
|
|
35bb946 |
|
|
|
35bb946 |
fixes #7047
|
|
|
35bb946 |
|
|
|
35bb946 |
(cherry picked from commit 28464ae0e21e7b9dfea7b733f9470091b2480a9a)
|
|
|
35bb946 |
---
|
|
|
35bb946 |
src/network/networkd-link.c | 3 ++-
|
|
|
35bb946 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
35bb946 |
|
|
|
35bb946 |
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
|
|
|
35bb946 |
index c581a49b4e..70039940bc 100644
|
|
|
35bb946 |
--- a/src/network/networkd-link.c
|
|
|
35bb946 |
+++ b/src/network/networkd-link.c
|
|
|
35bb946 |
@@ -3085,7 +3085,8 @@ static int link_carrier_lost(Link *link) {
|
|
|
35bb946 |
return r;
|
|
|
35bb946 |
}
|
|
|
35bb946 |
|
|
|
35bb946 |
- (void) sd_dhcp_server_stop(link->dhcp_server);
|
|
|
35bb946 |
+ if (link_dhcp4_server_enabled(link))
|
|
|
35bb946 |
+ (void) sd_dhcp_server_stop(link->dhcp_server);
|
|
|
35bb946 |
|
|
|
35bb946 |
r = link_drop_config(link);
|
|
|
35bb946 |
if (r < 0)
|