Ubuntu/jammy 23.4.x #4706
Merged
Ubuntu/jammy 23.4.x #4706
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fix: Handle systemctl commands when dbus not ready During `cloud-init status`, we check systemctl to ensure the status we're reporting is accurate. However, we can get an error from systemctl if dbus isn't ready yet. This commit will either ignore the error if we can assume that cloud-init is still running, or retry until we get a proper response from systemctl. Fixes canonicalGH-4676
Bump the version in cloudinit/version.py to 23.4.1 and update ChangeLog.
patches: debian/patches/retain-apt-pre-deb822.patch debian/patches/status-do-not-remove-duplicated-data.patch
blackboxsw
requested changes
Jan 2, 2024
|
|
||
| * d/p/retain-apt-pre-deb822.patch: | ||
| - Disable apt source list generation with DEB822 style | ||
| * Upstream snapshot based on 23.4.1. (LP: #2045582). |
There was a problem hiding this comment.
changeset, version and pkg build look good. We are missing capture of the refreshed patches in debian/changelog. We also missed this in our first -proposed upload of 23.4-0.
Here's a suggested diff for jammy
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ cloud-init (23.4.1-0ubuntu0~22.04.1) jammy; urgency=medium
* d/p/retain-apt-pre-deb822.patch:
- Disable apt source list generation with DEB822 style
+ * refresh patches:
+ - d/p/status-do-not-remove-duplicated-data.patch
+ * d/changelog: amend 23.4-0 refresh patches entry
* Upstream snapshot based on 23.4.1. (LP: #2045582).
List of changes from upstream can be found at
https://raw.githubusercontent.com/canonical/cloud-init/23.4.1/ChangeLog
@@ -15,6 +18,8 @@ cloud-init (23.4-0ubuntu1~22.04.1) jammy; urgency=medium
- Revert behavior downstream, leave duplicate data
* d/p/series: bring back retain-old-groups.patch.
This patch was inadvertently dropped in 5d4a3cf.
+ * refresh patches:
+ - d/p/do-not-block-user-login.patch
* Upstream snapshot based on 23.4. (LP: #2045582).
List of changes from upstream can be found at
https://raw.githubusercontent.com/canonical/cloud-init/23.4/ChangeLog
blackboxsw
force-pushed
the
ubuntu/jammy-23.4.x
branch
from
4fdf2e0 to
41cbfec
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Do not squash
Steps to reproduce