[pve-devel] [PATCH stable-7 container 2/2] setup: unlink default netplan configuration even with Ubuntu >= 23.04

[Christoph Heiss]

From: Fiona Ebner <f.ebner at 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 at proxmox.com>
(cherry picked from commit dfcbad017361d4e3ded20af573fbaeacc05231eb)
Signed-off-by: Christoph Heiss <c.heiss at 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