From 7169cdc8b971485751e4d92a1cae2d706293ecf9 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 13 Aug 2018 16:12:56 +0900 Subject: [PATCH] network: prohibit to set MTUBytes= and UseMTU= simultaneously --- man/systemd.network.xml | 1 + src/network/networkd-network.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/man/systemd.network.xml b/man/systemd.network.xml index cbf53f323ab..31af7cfa983 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -1167,6 +1167,7 @@ When true, the interface maximum transmission unit from the DHCP server will be used on the current link. + If MTUBytes= is set, then this setting is ignored. Defaults to false. diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 77ba8c678ee..c61614f1c8d 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -281,6 +281,12 @@ static int network_load_one(Manager *manager, const char *filename) { if (network->ip_masquerade) network->ip_forward |= ADDRESS_FAMILY_IPV4; + if (network->mtu > 0 && network->dhcp_use_mtu) { + log_warning("MTUBytes= in [Link] section and UseMTU= in [DHCP] section are set in %s. " + "Disabling UseMTU=.", filename); + network->dhcp_use_mtu = false; + } + LIST_PREPEND(networks, manager->networks, network); r = hashmap_ensure_allocated(&manager->networks_by_name, &string_hash_ops); -- 2.39.5