Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-06-07 08:01:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(functions): cloud-init.service renamed cloud-init-network.service

Browse Source 
In cloud-init version 24.3, single process mode where a shared python
systemd service cloud-init-main. In that release, cloud-init.service was
renamed cloud-init-network.service to better clarify cloud-init's
systemd unit names relative to the cloud-init boot stages.

This rename only applies to Oracular and newer releases.

See: https://discourse.ubuntu.com/t/announcement-cloud-init-perfomance-optimization-single-process/47505

functions drops in a complete override for cloud-init.service. That
override in /etc/systemd/system needs to be renamed and refreshed to
latest single process configuration.

LP: #2081325
This commit is contained in:
Chad Smith 2024-09-20 10:37:20 -06:00
parent 160cca31da
commit c567b71239
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
live-build/functions
View File

@ -1046,20 +1046,22 @@ EOF
# it disables all previous network config in /etc/netplan so # it disables all previous network config in /etc/netplan so
# any previous 50-cloud-init.yaml will be rendered inert. # any previous 50-cloud-init.yaml will be rendered inert.
# Position cloud-init.service After=NetworkManager.service. # Position cloud-init-network.service After=NetworkManager.service.
# (LP: #2008952. Drop-in systemd files cannot redact existing # (LP: #2008952. Drop-in systemd files cannot redact existing
# dependencies (Before= or After=). So, replace the entire unit # dependencies (Before= or After=). So, replace the entire unit
# with an override in /etc/systemd/system/cloud-init.service. # with an override in /etc/systemd/system/cloud-init-network.service.
# Avoid issues reported by debsums (LP: #2069391) by not overwriting # Avoid issues reported by debsums (LP: #2069391) by not overwriting
# unit files delivered by the cloud-init deb. # unit files delivered by the cloud-init deb.
# This drop-in will need to track any changes introduced by cloud-init # This drop-in will need to track any changes introduced by cloud-init
# SRUs which alter the cloud-init.service unit values. # SRUs which alter the cloud-init-network.service unit values.
# This override can be dropped when NetworkManager.service can run # This override can be dropped when NetworkManager.service can run
# Before=sysinit.target when it drops strict dbus.service dependency. # Before=sysinit.target when it drops strict dbus.service dependency.
# 24.3 renamed cloud-init.service to cloud-init-network.service for
# single process mode
mkdir -p chroot/etc/systemd/system/ mkdir -p chroot/etc/systemd/system/
cat <<EOF > chroot/etc/systemd/system/cloud-init.service cat <<EOF > chroot/etc/systemd/system/cloud-init-network.service
${AUTOMATION_HEADER} ${AUTOMATION_HEADER}
# Based on cloud-init 24.2 for Desktop LiveCD # Based on cloud-init 24.3 for Desktop LiveCD
# Redact sysinit.target from Before, add After=NetworkManager*.service # Redact sysinit.target from Before, add After=NetworkManager*.service
# (LP: #2008952) # (LP: #2008952)
[Unit] [Unit]
@ -1086,7 +1088,14 @@ ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
[Service] [Service]
Type=oneshot Type=oneshot
ExecStart=/usr/bin/cloud-init init # This service is a shim which preserves systemd ordering while allowing a
# single Python process to run cloud-init's logic. This works by communicating
# with the cloud-init process over a unix socket to tell the process that this
# stage can start, and then wait on a return socket until the cloud-init
# process has completed this stage. The output from the return socket is piped
# into a shell so that the process can send a completion message (defaults to
# "done", otherwise includes an error message) and an exit code to systemd.
ExecStart=sh -c 'echo "start" | netcat -Uu -W1 /run/cloud-init/share/network.sock -s /run/cloud-init/share/network-return.sock | sh'
RemainAfterExit=yes RemainAfterExit=yes
TimeoutSec=0 TimeoutSec=0