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

Revert "functions: proper cloud-init.service full unit override in etc"

Browse Source 
This reverts commit 736099c6b6ae5e5a27f72fd697fe02e91bb10fac.
This commit is contained in:
Dan Bungert 2025-07-31 11:26:05 -06:00
parent b05cffdb55
commit 1ff53fd2d3
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
live-build/functions
View File

@ -1070,42 +1070,35 @@ EOF
# 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.service After=NetworkManager.service.
# (LP: #2008952. Drop-in systemd files cannot redact existing # (LP: #2008952).
# dependencies (Before= or After=). So, replace the entire unit # We override the entire cloud-init.service definition because
# with an override in /etc/systemd/system/cloud-init.service. # systemd drop-in files only allow adding Before/After constraints
# Avoid issues reported by debsums (LP: #2069391) by not overwriting # yet we are dropping the Before=sysinit.target from the upstream
# unit files delivered by the cloud-init deb. # cloud-init.service.
# 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 # 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.
mkdir -p chroot/etc/systemd/system/ cat <<EOF > chroot/lib/systemd/system/cloud-init.service
cat <<EOF > chroot/etc/systemd/system/cloud-init.service
${AUTOMATION_HEADER} ${AUTOMATION_HEADER}
# Based on cloud-init 24.2 for Desktop LiveCD # Based on cloud-init 23.1 for Desktop LiveCD
# Redact sysinit.target from Before, add After=NetworkManager*.service
# (LP: #2008952)
[Unit] [Unit]
# https://cloudinit.readthedocs.io/en/latest/explanation/boot.html Description=Initial cloud-init job (metadata service crawler)
Description=Cloud-init: Network Stage
DefaultDependencies=no DefaultDependencies=no
Wants=cloud-init-local.service Wants=cloud-init-local.service
Wants=sshd-keygen.service Wants=sshd-keygen.service
Wants=sshd.service Wants=sshd.service
After=cloud-init-local.service After=cloud-init-local.service
After=systemd-networkd-wait-online.service After=systemd-networkd-wait-online.service
# Installer Added After=NetworkManager* ordering
After=NetworkManager.service
After=NetworkManager-wait-online.service
After=networking.service After=networking.service
After=NetworkManager.service NetworkManager-wait-online.service
Before=network-online.target Before=network-online.target
Before=sshd-keygen.service Before=sshd-keygen.service
Before=sshd.service Before=sshd.service
Before=systemd-user-sessions.service # Before=sysinit.target Installer removed to allow for NM dependency
# Before=sysinit.target Redacted due to NetworkManager.service dbus depends
Before=shutdown.target Before=shutdown.target
Conflicts=shutdown.target Conflicts=shutdown.target
ConditionPathExists=!/etc/cloud/cloud-init.disabled Before=systemd-user-sessions.service
ConditionKernelCommandLine=!cloud-init=disabled
ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
[Service] [Service]
Type=oneshot Type=oneshot