Merge ~waveform/ubuntu/+source/ubuntu-settings:network-manager into ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master

[Dave Jones]

[Lukas Märdian (slyon)]

Thank you, lgtm!

This should probably be release noted for Mantic.

review: Approve

[Dave Jones (waveform)]

Agreed -- I'll stick it in the notes

diff --git a/data/ubuntu/00-network-manager-all.yaml b/data/ubuntu/00-network-manager-all.yaml
new file mode 100644
index 0000000..4a8fd08
--- /dev/null
+++ b/data/ubuntu/00-network-manager-all.yaml
@@ -0,0 +1,4 @@
+# Let NetworkManager manage all devices on this system
+network:
+  version: 2
+  renderer: NetworkManager
diff --git a/debian/changelog b/debian/changelog
index e6eea71..dc0b3b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ubuntu-settings (23.10.1) UNRELEASED; urgency=medium
+
+  * ubuntu-settings: migrated (unowned, livecd-rootfs hack based) netplan
+    network-manager configuration to /lib/netplan from /etc/netplan
+    (LP: #2020110)
+
+ -- Dave Jones <[e-mail]>  Thu, 18 May 2023 15:34:12 +0100
+
 ubuntu-settings (23.04.5) lunar; urgency=medium
 
   * ubuntu-raspi-settings-desktop: Don't attempt to prepare oem-config in
diff --git a/debian/rules b/debian/rules
index 2e1de50..eb51c58 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,9 @@
 %:
 	dh $@ --with translations
 
+override_dh_fixperms:
+	dh_fixperms --exclude lib/netplan/00-network-manager-all.yaml
+
 override_dh_missing:
 	dh_missing --fail-missing
 
diff --git a/debian/ubuntu-settings.install b/debian/ubuntu-settings.install
index 7e32f86..cee8364 100644
--- a/debian/ubuntu-settings.install
+++ b/debian/ubuntu-settings.install
@@ -1,2 +1,3 @@
 usr/share/ubuntu
 usr/share/ubuntu-wayland
+lib/netplan/00-network-manager-all.yaml
diff --git a/debian/ubuntu-settings.postinst b/debian/ubuntu-settings.postinst
new file mode 100644
index 0000000..61a0dd9
--- /dev/null
+++ b/debian/ubuntu-settings.postinst
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    configure)
+        # Remove the obsolete (unpackaged) netplan config file (if unmodified),
+        # or moved it to .dpkg-backup (if modified). This isn't done with
+        # dpkg-maintscripts because those require the prior version was owned
+        # by the package (and this file is owned by nothing).
+        NM_CONF="/etc/netplan/01-network-manager-all.yaml"
+        if [ -e "$NM_CONF" ]; then
+            if [ "$(md5sum "$NM_CONF" | cut -d" " -f1)" = "81c200b0e29eeb56c518a23eb78777ab" ]; then
+                rm -f "$NM_CONF"
+            else
+                echo "Moving modified $NM_CONF to .dpkg-backup" >&2
+                mv -f "$NM_CONF" "${NM_CONF}.dpkg-backup"
+            fi
+        fi
+        ;;
+esac
+
+#DEBHELPER#
diff --git a/meson.build b/meson.build
index 28fd7ef..75c2444 100644
--- a/meson.build
+++ b/meson.build
@@ -19,6 +19,9 @@ install_data('data/ubuntu/applications/info.desktop',
               install_dir: datadir+'/ubuntu/applications/')
 install_data('data/ubuntu/applications/texdoctk.desktop',
               install_dir: datadir+'/ubuntu/applications/')
+install_data('data/ubuntu/00-network-manager-all.yaml',
+              install_dir: '/lib/netplan',
+              install_mode: 'rw-------')
 foreach dir : ['data/ubuntu-wayland', 'data/icons']
         install_subdir(dir, install_dir: datadir)
 endforeach