diff options
| author |   rogerjames99 <roger@beardandsandals.co.uk> | 2018-12-28 06:34:43 +0000 |
|---|---|---|
| committer |   Mike Gilbert <floppym@gentoo.org> | 2019-01-03 11:51:58 -0500 |
| commit | 9c21f88e1da0a97d9435b7728e19458b372956c8 (patch) | |
| tree | da6d074677045e6d5b4008b0ef808f1e603ff014 | |
| parent | meson: use cross compilation compatible c++ check (diff) | |
| download | systemd-9c21f88e1da0a97d9435b7728e19458b372956c8.tar.gz systemd-9c21f88e1da0a97d9435b7728e19458b372956c8.tar.bz2 systemd-9c21f88e1da0a97d9435b7728e19458b372956c8.zip | |
Do not start server if it is already runnning (#11245)
(cherry picked from commit 7da7340afdd4760fb2dd9d000105c324a77aff4b)
| -rw-r--r-- | src/network/networkd-link.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index e2851df31..cadf7f8b0 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"); } |