From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id D1E2C1FF38F for ; Tue, 4 Jun 2024 10:36:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 01FF8CD3F; Tue, 4 Jun 2024 10:37:06 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Tue, 4 Jun 2024 10:34:11 +0200 Message-ID: <20240604083523.357515-3-c.heiss@proxmox.com> X-Mailer: git-send-email 2.44.1 In-Reply-To: <20240604083523.357515-1-c.heiss@proxmox.com> References: <20240604083523.357515-1-c.heiss@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.237 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 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current years SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [ubuntu.pm, proxmox.com] Subject: [pve-devel] [PATCH stable-7 container 2/2] setup: unlink default netplan configuration even with Ubuntu >= 23.04 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" From: Fiona Ebner It seems like commit 02d9462 ("setup: enable systemd-networkd via preset for ubuntu 23.04+") also resulted in the default netplan configuration no longer being unlinked. That should still happen, even if systemd-networkd is now enabled via preset. Otherwise, the network configuration created by Proxmox VE is not ordered before the one generated by netplan and thus not applied by systemd-networkd. Reported in the community forum: https://forum.proxmox.com/threads/145848/post-658058 Fixes: 02d9462 ("setup: enable systemd-networkd via preset for ubuntu 23.04+") Signed-off-by: Fiona Ebner (cherry picked from commit dfcbad017361d4e3ded20af573fbaeacc05231eb) Signed-off-by: Christoph Heiss --- src/PVE/LXC/Setup/Ubuntu.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/PVE/LXC/Setup/Ubuntu.pm b/src/PVE/LXC/Setup/Ubuntu.pm index cea8ef5..897eab9 100644 --- a/src/PVE/LXC/Setup/Ubuntu.pm +++ b/src/PVE/LXC/Setup/Ubuntu.pm @@ -73,7 +73,9 @@ sub template_fixup { '/etc/systemd/system/multi-user.target.wants/systemd-networkd.service'); $self->ct_symlink('/lib/systemd/system/systemd-networkd.socket', '/etc/systemd/system/socket.target.wants/systemd-networkd.socket'); + } + if ($version >= '17.10') { # unlink default netplan lxc config $self->ct_unlink('/etc/netplan/10-lxc.yaml'); } -- 2.44.1 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel