Merge ~waveform/ubuntu/+source/ubuntu-settings:growroot-almost 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/growroot-almost b/data/raspberrypi/growroot-almost
 new file mode 100755
index 0000000..9b13e3e
--- /dev/null
+++ b/data/raspberrypi/growroot-almost
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+set -eu
+
+MYNAME=${0##*/}
+
+usage() {
+	echo "Usage: $MYNAME [ -u | --unused SECTORS ] MOUNT-POINT"
+}
+
+help() {
+	usage
+	cat << EOF
+
+Resizes the ext2/3/4 file-system at the specified MOUNT-POINT to the size of
+the underlying block device, optionally leaving the specified number of
+512-byte sectors unused at the end of the device. This is intended to make
+later encapsulation of the file-system in LUKS easier to manage.
+
+Typically this tool must be run as root.
+EOF
+}
+
+main() {
+	if ! parsed_args=$(getopt -n "$MYNAME" -o hu: --long help,unused: -- "$@"); then
+		usage
+		exit 1
+	fi
+
+	unused=0
+	eval set -- "$parsed_args"
+	while :; do
+		case "$1" in
+			-s | --unused)
+				unused="$2"
+				shift 2
+				;;
+			-h | --help)
+				help
+				exit 0
+				;;
+			--)
+				shift
+				break
+				;;
+			*)
+				echo "Internal error: $1 unknown" >&2
+				exit 63
+				;;
+		esac
+	done
+	if [ "$#" -ne 1 ]; then
+		usage
+		exit 1
+	fi
+
+	mount_point="$1"
+	fstype=$(findmnt --output FSTYPE --noheadings "$mount_point")
+	case "$fstype" in
+		ext2|ext3|ext4)
+			device=$(findmnt --output SOURCE --noheadings "$mount_point")
+
+			old_size=$(blockdev --getsz "$device") # sectors
+			new_size=$((old_size - unused))
+			resize2fs "$device" "$new_size"s
+			;;
+		*)
+			echo "Specified mount is not an ext file-system" >&2
+			exit 1
+			;;
+	esac
+}
+
+main "$@"
diff --git a/data/raspberrypi/growroot-almost.service b/data/raspberrypi/growroot-almost.service
 new file mode 100644
index 0000000..478fdff
--- /dev/null
+++ b/data/raspberrypi/growroot-almost.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Grow the root file-system, leaving 16MB space for LUKS headers
+DefaultDependencies=no
+Requires=local-fs.target
+After=local-fs.target
+Before=mkswap.service
+ConditionPathExists=!/etc/growroot-grown
+
+[Service]
+Type=oneshot
+# 32768 512-sectors is 16MB
+ExecStart=/usr/sbin/growroot-almost --unused 32768 /
+ExecStartPost=touch /etc/growroot-grown
+
+[Install]
+WantedBy=swap.target
diff --git a/data/raspberrypi/meson.build b/data/raspberrypi/meson.build
index a390c5e..5a0daeb 100644
--- a/data/raspberrypi/meson.build
+++ b/data/raspberrypi/meson.build
@@ -1,6 +1,7 @@
 etc = get_option('sysconfdir')
 var_lib = get_option('sharedstatedir')
 usr_share = get_option('datadir')
+sbin = get_option('sbindir')
 
 install_data('10-raspi-eth0.link',
              install_dir: 'lib/systemd/network')
@@ -16,3 +17,13 @@ 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')
+install_data('growroot-almost',
+             install_dir: sbin)
+install_data('growroot-almost.service',
+             install_dir: '/lib/systemd/system')
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..416d831 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+ubuntu-settings (23.04.4) UNRELEASED; urgency=medium
+
+  [ Dave Jones ]
+  * 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)
+  * ubuntu-raspi-settings-desktop: add growroot-almost service to expand
+    root fs leaving 16MB slack for potential LUKS encapsulation (LP: #2013080)
+  * Bump standards version to current (4.6.2)
+
+  [ William 'jawn-smith' Wilson ]
+  * Add oem-config-setup to ubuntu-raspi-settings-desktop.postinst
+    (LP: #2011722)
+
+ -- 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..2e1de50 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,11 @@
 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
+	dh_installsystemd -pubuntu-raspi-settings-desktop --name=growroot-almost growroot-almost.service
+
 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..6ec0480 100644
--- a/debian/ubuntu-raspi-settings-desktop.install
+++ b/debian/ubuntu-raspi-settings-desktop.install
@@ -1,3 +1,8 @@
 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
+usr/sbin/growroot-almost
+lib/systemd/system/growroot-almost.service
diff --git a/debian/ubuntu-raspi-settings-desktop.lintian-overrides b/debian/ubuntu-raspi-settings-desktop.lintian-overrides
 new file mode 100644
index 0000000..a8b9ee3
--- /dev/null
+++ b/debian/ubuntu-raspi-settings-desktop.lintian-overrides
@@ -0,0 +1,14 @@
+# Yes, we actually want swap.target for the swap file, and for growing the
+# root fs that contains the swap file...
+systemd-service-file-refers-to-unusual-wantedby-target swap.target [lib/systemd/system/mkswap.service]
+systemd-service-file-refers-to-unusual-wantedby-target swap.target [lib/systemd/system/growroot-almost.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]
+
+# growroot-almost is also an utterly trivial script (and service) that should
+# only be run once
+no-manual-page [usr/sbin/growroot-almost]
+systemd-service-file-missing-documentation-key [lib/systemd/system/growroot-almost.service]
diff --git a/debian/ubuntu-raspi-settings-desktop.postinst b/debian/ubuntu-raspi-settings-desktop.postinst
 new file mode 100644
index 0000000..afe9b1b
--- /dev/null
+++ b/debian/ubuntu-raspi-settings-desktop.postinst
@@ -0,0 +1,32 @@
+#!/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
+        # Set up oem-config to run on firstboot if and only if it hasn't
+        # already run
+        if [ ! -f "/var/log/oem-config.log" ] && ! id oem 2>/dev/null ; then
+            useradd -d /home/oem -G adm,sudo -m -N -u 29999 oem
+            oem-config-prepare --quiet
+            touch "/var/lib/oem-config/run"
+        fi
+        ;;
+esac
+
+#DEBHELPER#