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

Devel sync oracular #5744

Merged
merged 6 commits into from
Sep 25, 2024
Merged

Devel sync oracular #5744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4f8a136
Add d/p//cpick-nocloudnet-seedfrom-sysconfig-fix.patch
blackboxsw Sep 13, 2024
7b6a3e8
update changelog
blackboxsw Sep 13, 2024
94674d6
releasing cloud-init version 24.4~3+really24.3.1-0ubuntu3
blackboxsw Sep 13, 2024
82b4b7e
Add d/p/cpick-hotplugd-systemd-ordering-fix.patch
blackboxsw Sep 20, 2024
a59c8e0
update changelog
blackboxsw Sep 20, 2024
0c963ef
releasing cloud-init version 24.4~3+really24.3.1-0ubuntu4
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
17 changes: 17 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
cloud-init (24.4~3+really24.3.1-0ubuntu4) oracular; 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 <chad.smith@canonical.com> Fri, 20 Sep 2024 15:31:13 -0600

cloud-init (24.4~3+really24.3.1-0ubuntu3) oracular; urgency=medium

* Bug fix release (LP: #2080688):
d/p/cpick-nocloudnet-seedfrom-sysconfig-fix.patch fix NoCloudNet
detection when seedfrom config provided in /etc/cloud/cloud.cfg/*.cfg

-- Chad Smith <chad.smith@canonical.com> Fri, 13 Sep 2024 14:44:45 -0600

cloud-init (24.4~3+really24.3.1-0ubuntu2) oracular; urgency=medium

* d/cloud-init.postinst: fix MAAS preseed provisioning by replacing
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 <chad.smith@canonical.com>
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
Loading
Loading