From 97dd81183b3222b05cc53c3637e934fc2c61a5f0 Mon Sep 17 00:00:00 2001
From: Chad Smith <chad.smith@canonical.com>
Date: Tue, 16 Jul 2024 06:32:34 -0600
Subject: [PATCH] functions: proper cloud-init.service full unit override in
 etc

System override drop-ins cannot redact dependencies (Before or After) and
thus require a full unit override. Avoid writing the unit file delivered
by cloud-init deb package in /lib/systemd/system/cloud-init.service because
it will generate warnings fron debsums -c about modified files.

The correct place to provide a full unit override is in
/etc/systemd/system/cloud-init.service in order to drop
Before=sysinit.target from the packaged cloud-init.service file.

Note vigilance will be needed across cloud-init SRU boundaries to ensure
we sync any cloud-init.service unit changes that are introduced to
stable releases because livecd-rootfs is overriding the whole file.

LP: #2069391
---
 live-build/functions | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/live-build/functions b/live-build/functions
index 543bb3f2..7dc688b8 100644
--- a/live-build/functions
+++ b/live-build/functions
@@ -1044,35 +1044,42 @@ EOF
         # any previous 50-cloud-init.yaml will be rendered inert.
 
         # Position cloud-init.service After=NetworkManager.service.
-        # (LP: #2008952).
-        # We override the entire cloud-init.service definition because
-        # systemd drop-in files only allow adding Before/After constraints
-        # yet we are dropping the Before=sysinit.target from the upstream
-        # cloud-init.service.
+        # (LP: #2008952. Drop-in systemd files cannot redact existing
+        # dependencies (Before= or After=). So, replace the entire unit
+        # with an override in /etc/systemd/system/cloud-init.service.
+        # Avoid issues reported by debsums (LP: #2069391) by not overwriting
+        # unit files delivered by the cloud-init deb.
+        # This drop-in will need to track any changes introduced by cloud-init
+        # SRUs which alter the cloud-init.service unit values.
         # This override can be dropped when NetworkManager.service can run
         # Before=sysinit.target when it drops strict dbus.service dependency.
-        cat <<EOF > chroot/lib/systemd/system/cloud-init.service
+        mkdir -p chroot/etc/systemd/system/
+        cat <<EOF > chroot/etc/systemd/system/cloud-init.service
 ${AUTOMATION_HEADER}
-# Based on cloud-init 23.1 for Desktop LiveCD
+# Based on cloud-init 24.2 for Desktop LiveCD
+# Redact sysinit.target from Before, add After=NetworkManager*.service
+# (LP: #2008952)
 [Unit]
-Description=Initial cloud-init job (metadata service crawler)
+# https://cloudinit.readthedocs.io/en/latest/explanation/boot.html
+Description=Cloud-init: Network Stage
 DefaultDependencies=no
 Wants=cloud-init-local.service
 Wants=sshd-keygen.service
 Wants=sshd.service
 After=cloud-init-local.service
 After=systemd-networkd-wait-online.service
-# Installer Added After=NetworkManager* ordering
-After=NetworkManager.service
-After=NetworkManager-wait-online.service
 After=networking.service
+After=NetworkManager.service NetworkManager-wait-online.service
 Before=network-online.target
 Before=sshd-keygen.service
 Before=sshd.service
-# Before=sysinit.target  Installer removed to allow for NM dependency
+Before=systemd-user-sessions.service
+# Before=sysinit.target Redacted due to NetworkManager.service dbus depends
 Before=shutdown.target
 Conflicts=shutdown.target
-Before=systemd-user-sessions.service
+ConditionPathExists=!/etc/cloud/cloud-init.disabled
+ConditionKernelCommandLine=!cloud-init=disabled
+ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
 
 [Service]
 Type=oneshot