Merge ~waveform/ubuntu/+source/ubuntu-settings:bonfire-of-hacks into ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master

[Dave Jones]

[Dave Jones (waveform)]

Please see associated bug; it should link to both relevant merge requests

diff --git a/data/raspberrypi/01-use-network-manager.yaml b/data/raspberrypi/01-use-network-manager.yaml
new file mode 100644
index 0000000..4a8fd08
--- /dev/null
+++ b/data/raspberrypi/01-use-network-manager.yaml
@@ -0,0 +1,4 @@
+# Let NetworkManager manage all devices on this system
+network:
+  version: 2
+  renderer: NetworkManager
diff --git a/data/raspberrypi/meson.build b/data/raspberrypi/meson.build
index a390c5e..d082316 100644
--- a/data/raspberrypi/meson.build
+++ b/data/raspberrypi/meson.build
@@ -16,3 +16,9 @@ install_data('raspi-zswap.conf',
              install_dir: usr_share / 'initramfs-tools/modules.d')
 install_data('99-fake-cloud.cfg',
              install_dir: etc / 'cloud/cloud.cfg.d')
+install_data('mkswap.service',
+             install_dir: '/lib/systemd/system')
+install_data('swapfile.swap',
+             install_dir: '/lib/systemd/system')
+install_data('01-use-network-manager.yaml',
+             install_dir: etc / 'netplan')
diff --git a/data/raspberrypi/mkswap.service b/data/raspberrypi/mkswap.service
new file mode 100644
index 0000000..6fc4829
--- /dev/null
+++ b/data/raspberrypi/mkswap.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Create the default swapfile
+DefaultDependencies=no
+Requires=local-fs.target
+After=local-fs.target
+Before=swapfile.swap
+ConditionPathExists=!/swapfile
+
+[Service]
+Type=oneshot
+ExecStartPre=fallocate -l 1GiB /swapfile
+ExecStartPre=chmod 600 /swapfile
+ExecStart=mkswap /swapfile
+
+[Install]
+WantedBy=swap.target
diff --git a/data/raspberrypi/swapfile.swap b/data/raspberrypi/swapfile.swap
new file mode 100644
index 0000000..d52a3f6
--- /dev/null
+++ b/data/raspberrypi/swapfile.swap
@@ -0,0 +1,8 @@
+[Unit]
+Description=The default swapfile
+
+[Swap]
+What=/swapfile
+
+[Install]
+WantedBy=swap.target
diff --git a/debian/changelog b/debian/changelog
index 27c9fa0..c4f4cc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ubuntu-settings (23.04.4) UNRELEASED; urgency=medium
+
+  * ubuntu-raspi-settings-desktop: migrated livecd-rootfs hacks that
+    introduce mkswap.service and swapfile.swap (LP: #2004430)
+  * ubuntu-raspi-settings-desktop: migrated netplan network-manager
+    configuration (LP: #2004430)
+  * Bump standards version to current (4.6.2)
+
+ -- Dave Jones <[e-mail]>  Tue, 28 Mar 2023 13:48:22 +0100
+
 ubuntu-settings (23.04.3) lunar; urgency=medium
 
   * gnome-initial-setup.desktop: Set StartupWMClass to fix app name & icon
diff --git a/debian/control b/debian/control
index 5735844..18486e5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Ubuntu Desktop Team <[e-mail]>
 Build-Depends: debhelper-compat (= 12), meson (>= 0.40.1), dh-translations
-Standards-Version: 4.6.0.1
+Standards-Version: 4.6.2
 Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/ubuntu-settings
 Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/ubuntu-settings
 
diff --git a/debian/rules b/debian/rules
index 6c33aaa..f68d3f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,10 @@
 override_dh_missing:
 	dh_missing --fail-missing
 
+override_dh_installsystemd:
+	dh_installsystemd -pubuntu-raspi-settings-desktop --name=mkswap mkswap.service
+	dh_installsystemd -pubuntu-raspi-settings-desktop --name=swapfile swapfile.swap
+
 override_dh_installgsettings:
 	dh_installgsettings -pubuntu-raspi-settings --priority 15
 	dh_installgsettings --remaining-packages
diff --git a/debian/ubuntu-raspi-settings-desktop.install b/debian/ubuntu-raspi-settings-desktop.install
index 6e4a375..12a9b2a 100644
--- a/debian/ubuntu-raspi-settings-desktop.install
+++ b/debian/ubuntu-raspi-settings-desktop.install
@@ -1,3 +1,6 @@
 usr/share/initramfs-tools/modules.d/raspi-zswap.conf
 var/lib/polkit-1/localauthority/10-vendor.d/disable-suspend.pkla
 usr/lib/NetworkManager/conf.d/ZZraspi-wifi-powersave-off.conf
+lib/systemd/system/mkswap.service
+lib/systemd/system/swapfile.swap
+etc/netplan/01-use-network-manager.yaml
diff --git a/debian/ubuntu-raspi-settings-desktop.lintian-overrides b/debian/ubuntu-raspi-settings-desktop.lintian-overrides
new file mode 100644
index 0000000..1914c78
--- /dev/null
+++ b/debian/ubuntu-raspi-settings-desktop.lintian-overrides
@@ -0,0 +1,7 @@
+# Yes, we actually want swap.target for the swap file...
+systemd-service-file-refers-to-unusual-wantedby-target swap.target [lib/systemd/system/mkswap.service]
+
+# We don't support any init-system other than systemd, and mkswap is a trivial
+# oneshot service
+package-supports-alternative-init-but-no-init.d-script [lib/systemd/system/mkswap.service]
+systemd-service-file-missing-documentation-key [lib/systemd/system/mkswap.service]
diff --git a/debian/ubuntu-raspi-settings-desktop.postinst b/debian/ubuntu-raspi-settings-desktop.postinst
new file mode 100644
index 0000000..5e1db8a
--- /dev/null
+++ b/debian/ubuntu-raspi-settings-desktop.postinst
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    configure)
+        # Unconditionally remove the obsolete (unpackaged) links activating the
+        # (previously unpackaged) mkswap.service and swapfile.swap units. These
+        # will instead be activated by dh_installsystemd creating links in
+        # /etc/systemd/system/swap.target.wants (which is where they should be
+        # rather than under /lib)
+        rm -f \
+            /lib/systemd/system/swap.target.wants/mkswap.service \
+            /lib/systemd/system/swap.target.wants/swapfile.swap
+        # Unconditionally remove the obsolete (unpackaged) netplan config file.
+        # This isn't done with rm_conffile or conffiles because those both
+        # refuse to work except on upgrade. We can't do it on upgrade to
+        # another package (e.g. ubuntu-raspi-settings) either because the
+        # "proper" methods both demand the prior version actually owned the
+        # file being removed. So...
+        rm -f /etc/netplan/01-network-manager-all.yaml
+        ;;
+esac
+
+#DEBHELPER#