From: Tom Fitzhenry <tom@tom-fitzhenry.me.uk>
Date: Sat, 16 Nov 2019 15:04:18 +0000 (+1100)
Subject: Error, rather than warn, if failing to start DHCP server
X-Git-Tag: v244-rc1~39
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a0fa3ef7ffe253ac72a2e6ed70f4facf884793d7;p=thirdparty%2Fsystemd.git

Error, rather than warn, if failing to start DHCP server

This would have made diagnosing https://github.com/systemd/systemd/issues/14050 easier.
---

diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c
index 77eb46341cc..1ae1d17057c 100644
--- a/src/network/networkd-dhcp-server.c
+++ b/src/network/networkd-dhcp-server.c
@@ -284,7 +284,7 @@ int dhcp4_server_configure(Link *link) {
 
         r = sd_dhcp_server_set_emit_router(link->dhcp_server, link->network->dhcp_server_emit_router);
         if (r < 0)
-                return log_link_warning_errno(link, r, "Failed to set router emission for DHCP server: %m");
+                return log_link_error_errno(link, r, "Failed to set router emission for DHCP server: %m");
 
         if (link->network->dhcp_server_emit_timezone) {
                 _cleanup_free_ char *buffer = NULL;
@@ -295,7 +295,7 @@ int dhcp4_server_configure(Link *link) {
                 else {
                         r = get_timezone(&buffer);
                         if (r < 0)
-                                return log_warning_errno(r, "Failed to determine timezone: %m");
+                                return log_error_errno(r, "Failed to determine timezone: %m");
 
                         tz = buffer;
                 }
@@ -316,7 +316,7 @@ int dhcp4_server_configure(Link *link) {
         if (!sd_dhcp_server_is_running(link->dhcp_server)) {
                 r = sd_dhcp_server_start(link->dhcp_server);
                 if (r < 0)
-                        return log_link_warning_errno(link, r, "Could not start DHCPv4 server instance: %m");
+                        return log_link_error_errno(link, r, "Could not start DHCPv4 server instance: %m");
         }
 
         return 0;