Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ cloud-init (24.1.3-0ubuntu1~20.04.4) UNRELEASED; urgency=medium
* d/cloud-init.logrotate: add logrotate config for cloud-init
* d/cloud-init.templates: enable WSL datasource by default
* d/control: remove netifaces
* d/p/drop-unsupported-systemd-condition-environment.patch
- Drop ConditionEnvironment from unit files because systemd 245.4 ignores
those keys and emits warnings at systemctl status
* d/p/keep-dhclient-as-priority-client.patch
* d/p/revert-551f560d-cloud-config-after-snap-seeding.patch
- Retain systemd ordering cloud-config.service After=snapd.seeded.service
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
Description: Drop systemd ignored ConditionEnvironment keys from units on Focal
The systemd ConditionEnvironment config key was introduced in systemd
version 246, yet Ubuntu Focal contains only systemd v. 245.4. This setting
is otherwise ignored by systemd on Focal, but drop the config to avoid
warnings from systemctl status cloud-init.
Origin: backport
Author: Chad Smith <chad.smith@canonical.com>
Last-Update: 2024-05-21
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/systemd/cloud-config.service.tmpl
+++ b/systemd/cloud-config.service.tmpl
@@ -6,7 +6,6 @@
Wants=network-online.target cloud-config.target
ConditionPathExists=!/etc/cloud/cloud-init.disabled
ConditionKernelCommandLine=!cloud-init=disabled
-ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled

[Service]
Type=oneshot
--- a/systemd/cloud-final.service.tmpl
+++ b/systemd/cloud-final.service.tmpl
@@ -9,7 +9,6 @@
Wants=network-online.target cloud-config.service
ConditionPathExists=!/etc/cloud/cloud-init.disabled
ConditionKernelCommandLine=!cloud-init=disabled
-ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled


[Service]
--- a/systemd/cloud-init-local.service.tmpl
+++ b/systemd/cloud-init-local.service.tmpl
@@ -28,7 +28,6 @@
RequiresMountsFor=/var/lib/cloud
ConditionPathExists=!/etc/cloud/cloud-init.disabled
ConditionKernelCommandLine=!cloud-init=disabled
-ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled

[Service]
Type=oneshot
--- a/systemd/cloud-init.service.tmpl
+++ b/systemd/cloud-init.service.tmpl
@@ -41,7 +41,6 @@
Before=systemd-user-sessions.service
ConditionPathExists=!/etc/cloud/cloud-init.disabled
ConditionKernelCommandLine=!cloud-init=disabled
-ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled

[Service]
Type=oneshot
--- a/systemd/cloud-init.target
+++ b/systemd/cloud-init.target
@@ -12,4 +12,3 @@
After=multi-user.target
ConditionPathExists=!/etc/cloud/cloud-init.disabled
ConditionKernelCommandLine=!cloud-init=disabled
-ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
1 change: 1 addition & 0 deletions debian/patches/series
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ retain-apt-pre-deb822.patch
status-retain-recoverable-error-exit-code.patch
retain-ec2-default-net-update-events.patch
cli-retain-file-argument-as-main-cmd-arg.patch
drop-unsupported-systemd-condition-environment.patch