From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id F3A9493D82 for ; Tue, 11 Apr 2023 14:45:25 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D879935EE5 for ; Tue, 11 Apr 2023 14:44:55 +0200 (CEST) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [IPv6:2a0a:1580:2000::2d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 11 Apr 2023 14:44:54 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 87F798175; Tue, 11 Apr 2023 14:44:54 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 7880F244F24; Tue, 11 Apr 2023 14:44:54 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Tue, 11 Apr 2023 14:44:48 +0200 Message-Id: <20230411124448.1441242-1-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.025 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy HEADER_FROM_DIFFERENT_DOMAINS 0.25 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pve-devel] [PATCH pve-container] fix #4457: use bridge mtu if no mtu is defined X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2023 12:45:26 -0000 Signed-off-by: Alexandre Derumier --- src/PVE/LXC.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index c4d53e8..0ccbb33 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -731,14 +731,14 @@ sub update_lxc_config { $raw .= "lxc.net.$ind.hwaddr = $d->{hwaddr}\n" if defined($d->{hwaddr}); $raw .= "lxc.net.$ind.name = $d->{name}\n" if defined($d->{name}); + my $bridge_mtu = PVE::Network::read_bridge_mtu($d->{bridge}); + my $mtu = $d->{mtu} || $bridge_mtu; + # Keep container from starting with invalid mtu configuration - if (my $mtu = $d->{mtu}) { - my $bridge_mtu = PVE::Network::read_bridge_mtu($d->{bridge}); - die "$k: MTU size '$mtu' is bigger than bridge MTU '$bridge_mtu'\n" - if ($mtu > $bridge_mtu); + die "$k: MTU size '$mtu' is bigger than bridge MTU '$bridge_mtu'\n" + if ($mtu > $bridge_mtu); - $raw .= "lxc.net.$ind.mtu = $mtu\n"; - } + $raw .= "lxc.net.$ind.mtu = $mtu\n"; # Starting with lxc 4.0, we do not patch lxc to execute our up-scripts. if ($lxc_major >= 4) { -- 2.30.2