From: Christoph Heiss <c.heiss@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH stable-7 container 2/2] setup: unlink default netplan configuration even with Ubuntu >= 23.04
Date: Tue, 4 Jun 2024 10:34:11 +0200 [thread overview]
Message-ID: <20240604083523.357515-3-c.heiss@proxmox.com> (raw)
In-Reply-To: <20240604083523.357515-1-c.heiss@proxmox.com>
From: Fiona Ebner <f.ebner@proxmox.com>
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 <f.ebner@proxmox.com>
(cherry picked from commit dfcbad017361d4e3ded20af573fbaeacc05231eb)
Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
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
next prev parent reply other threads:[~2024-06-04 8:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-04 8:34 [pve-devel] [PATCH stable-7 container 0/2] setup: cherry-pick ubuntu 24.04 support Christoph Heiss
2024-06-04 8:34 ` [pve-devel] [PATCH stable-7 container 1/2] setup: support Ubuntu 24.04 Noble Christoph Heiss
2024-06-04 8:34 ` Christoph Heiss [this message]
2024-06-04 10:48 ` [pve-devel] applied-series: [PATCH stable-7 container 0/2] setup: cherry-pick ubuntu 24.04 support Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240604083523.357515-3-c.heiss@proxmox.com \
--to=c.heiss@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox