d743bb5bcc
This reverts commits3fb4a15096
and0e8350ca14
. Either building with meson or other upstream changes was causing issues with booting, and I didn't have time to debug this properly.
30 lines
1.5 KiB
Diff
30 lines
1.5 KiB
Diff
From b2d91572a13de1cf5bdf78c3926b50cacc8a5dd3 Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Mon, 22 May 2017 14:38:01 +0200
|
|
Subject: [PATCH] sd-dhcp: library code shouldn't log above LOG_DEBUG (#6001)
|
|
|
|
Let's downgrade the warning introduced by
|
|
955d99edc7991386a36e3d33924cc584931fde91 to debug, as we really
|
|
shouldn't log at more than debug level from library code.
|
|
|
|
(And while we are at it, print the MTU as the right (unsigned) type in
|
|
the format string.)
|
|
(cherry picked from commit 4dd53da97daf3f064149380b6ca9e53273d77d88)
|
|
---
|
|
src/libsystemd-network/sd-dhcp-lease.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c
|
|
index 565ec4cbe4..13dc6e4386 100644
|
|
--- a/src/libsystemd-network/sd-dhcp-lease.c
|
|
+++ b/src/libsystemd-network/sd-dhcp-lease.c
|
|
@@ -595,7 +595,7 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const void *option, void
|
|
if (r < 0)
|
|
log_debug_errno(r, "Failed to parse MTU, ignoring: %m");
|
|
if (lease->mtu < DHCP_DEFAULT_MIN_SIZE) {
|
|
- log_warning("MTU value of %d too small. Using default MTU value of %d instead.", lease->mtu, DHCP_DEFAULT_MIN_SIZE);
|
|
+ log_debug("MTU value of %" PRIu16 " too small. Using default MTU value of %d instead.", lease->mtu, DHCP_DEFAULT_MIN_SIZE);
|
|
lease->mtu = DHCP_DEFAULT_MIN_SIZE;
|
|
}
|
|
|