From: rogerjames99 <roger@beardandsandals.co.uk>
Date: Fri, 28 Dec 2018 06:34:43 +0000 (+0000)
Subject: Do not start server if it is already runnning (#11245)
X-Git-Tag: archive/raspbian/240-5+rpi1^2~60
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c7c0ff76aa4fc89e2eb81e90abea270059712195;p=systemd.git

Do not start server if it is already runnning (#11245)

(cherry picked from commit 7da7340afdd4760fb2dd9d000105c324a77aff4b)

Gbp-Pq: Name Do-not-start-server-if-it-is-already-runnning-11245.patch
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index e2851df3..cadf7f8b 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1207,15 +1207,16 @@ static int link_request_set_addresses(Link *link) {
                                         return r;
                         }
                 }
+                if (!sd_dhcp_server_is_running(link->dhcp_server)) {
+                        r = sd_dhcp_server_start(link->dhcp_server);
+                        if (r < 0) {
+                                log_link_warning_errno(link, r, "Could not start DHCPv4 server instance: %m");
 
-                r = sd_dhcp_server_start(link->dhcp_server);
-                if (r < 0) {
-                        log_link_warning_errno(link, r, "Could not start DHCPv4 server instance: %m");
-
-                        link_enter_failed(link);
+                                link_enter_failed(link);
 
-                        return 0;
-                }
+                                return 0;
+                        }
+                }    
 
                 log_link_debug(link, "Offering DHCPv4 leases");
         }