Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Single cherry-pick fix into noble on top of what's queued in SRU verification. #5724

Merged
merged 3 commits into from
Sep 23, 2024
Merged

Single cherry-pick fix into noble on top of what's queued in SRU verification. #5724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97b67c4
Add d/p/cpick-hotplugd-systemd-ordering-fix.patch
blackboxsw Sep 20, 2024
f8d9bea
update changelog
blackboxsw Sep 20, 2024
147ecab
releasing cloud-init version 24.3.1-0ubuntu0~24.04.2
blackboxsw Sep 20, 2024
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
9 changes: 9 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
cloud-init (24.3.1-0ubuntu0~24.04.2) noble; urgency=medium

* Bug fix release (LP: #2081124):
d/p/cpick-hotplugd-systemd-ordering-fix.patch: fix systemd ordering cycle
issues with network cloud-init-hotplugd.socket, NetworkManager and
dbus.socket by adding DefaultDependencies=no to cloud-init-hotplugd.socket.

-- Chad Smith <[email protected]> Fri, 20 Sep 2024 16:07:14 -0600

cloud-init (24.3.1-0ubuntu0~24.04.1) noble; urgency=medium

* d/p/no-single-process.patch: Remove single process optimization
Expand Down
24 changes: 24 additions & 0 deletions debian/patches/cpick-hotplugd-systemd-ordering-fix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
Description: remove DefaultDependencies from cloud-init-hotplug.socket (#5722)
Shifting systemd ordering earlier in boot for cloud-init-hotplugd.socket
introduced a systemd ordering cycle due to After=sysinit.target being pulled
carried along witu cloud-init-hotplugd.socket in earlier boot. This caused
conflicts in only Ubuntu Live Desktop images which have a custom dropin from
livecd-rootfs which also orders cloud-init-network.service
After=NetworkManager.service. The livecd-rootfs override is documented in
LP: #2081325. This bug is not seen on Ubuntu Server images.
Author: Chad Smith <[email protected]>
Origin: upstream
Bug: https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/2081124
Last-Update: 2024-09-20
--- a/systemd/cloud-init-hotplugd.socket
+++ b/systemd/cloud-init-hotplugd.socket
@@ -5,6 +5,9 @@
# Known bug with an enforcing SELinux policy: LP: #1936229
[Unit]
Description=cloud-init hotplug hook socket
+DefaultDependencies=no
+Before=shutdown.target
+Conflicts=shutdown.target
After=cloud-config.target
ConditionPathExists=!/etc/cloud/cloud-init.disabled
ConditionKernelCommandLine=!cloud-init=disabled
1 change: 1 addition & 0 deletions debian/patches/series
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
deprecation-version-boundary.patch
no-single-process.patch
no-nocloud-network.patch
cpick-hotplugd-systemd-ordering-fix.patch
Loading