diff -Nru ubiquity-23.10.7/debian/changelog ubiquity-23.10.8/debian/changelog --- ubiquity-23.10.7/debian/changelog 2023-10-04 09:40:26.000000000 +0000 +++ ubiquity-23.10.8/debian/changelog 2023-10-05 16:13:39.000000000 +0000 @@ -1,3 +1,10 @@ +ubiquity (23.10.8) mantic; urgency=medium + + * Implement copying of netplan configs to the target system, so that network + configuration such as wifi is retained. (LP: #2036999) + + -- Dan Bungert Thu, 05 Oct 2023 10:13:39 -0600 + ubiquity (23.10.7) mantic; urgency=medium * Updated translations. diff -Nru ubiquity-23.10.7/scripts/plugininstall.py ubiquity-23.10.8/scripts/plugininstall.py --- ubiquity-23.10.7/scripts/plugininstall.py 2023-10-04 09:25:57.000000000 +0000 +++ ubiquity-23.10.8/scripts/plugininstall.py 2023-10-05 16:13:39.000000000 +0000 @@ -19,6 +19,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +import glob import grp import gzip import io @@ -1649,6 +1650,18 @@ shutil.copy(source_network, target_network) + source_netplan = "/etc/netplan" + target_netplan = "/target" + source_netplan + if os.path.exists(source_netplan) and os.path.exists(target_netplan): + for cfg in glob.glob("90-NM-*", root_dir=source_netplan): + source_cfg = os.path.join(source_netplan, cfg) + target_cfg = os.path.join(target_netplan, cfg) + + if os.path.exists(target_cfg): + continue + + shutil.copy(source_cfg, target_cfg) + def copy_bluetooth_config(self): if 'UBIQUITY_OEM_USER_CONFIG' in os.environ: return