From e5db326a7e4ea8ae70f88378d18020cbdde8a1bf Mon Sep 17 00:00:00 2001
From: Simon Quigley <tsimonq2@lubuntu.me>
Date: Sun, 8 Oct 2023 21:37:26 -0500
Subject: [PATCH] Quick vendor patch to add support for Netplan-based configs

---
 src/modules/networkcfg/main.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/modules/networkcfg/main.py b/src/modules/networkcfg/main.py
index 807fdf613..ed130c33a 100644
--- a/src/modules/networkcfg/main.py
+++ b/src/modules/networkcfg/main.py
@@ -14,6 +14,7 @@
 #
 
 import os
+import glob
 import shutil
 
 import libcalamares
@@ -131,6 +132,21 @@ def run():
             except FileExistsError:
                 pass
 
+    # Also install netplan files
+    source_netplan = "/etc/netplan"
+    root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
+    target_netplan = os.path.join(root_mount_point, source_netplan.lstrip('/'))
+
+    if os.path.exists(source_netplan) and os.path.exists(target_netplan):
+        for cfg in glob.glob(os.path.join(source_netplan, "90-NM-*")):
+            source_cfg = os.path.join(source_netplan, cfg)
+            target_cfg = os.path.join(target_netplan, os.path.basename(cfg))
+
+            if os.path.exists(target_cfg):
+                continue
+
+            shutil.copy(source_cfg, target_cfg)
+
     # We need to overwrite the default resolv.conf in the chroot.
     source_resolv, target_resolv = path_pair(root_mount_point, "etc/resolv.conf")
     if source_resolv != target_resolv and os.path.exists(source_resolv):