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.

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

fix dailies: Ubuntu/jammy #5851

Merged
merged 16 commits into from
Nov 4, 2024

Conversation

TheRealFalcon
Copy link
Member

Another tricky one. Please review thoroughly.

TheRealFalcon and others added 16 commits October 18, 2024 10:30
'pytest -n auto' fails with random data in parametrization, so
work around it.
Since After=sysinit.target is a default dependency, a cycle is
introduced when Before=sysinit.target and not DefaultDependencies=no.

Fixes canonicalGH-5755
A Before= on a single service doesn't need to exist in both
cloud-init-main.service and cloud-init-local.service, because
cloud-init-local.service and cloud-init-main.service are themselves
ordered. Only one requires it. The same applies for After=.
- RHEL family distros use ds-identify, and therefore the run directory is
  already made and ds-identify will have created the enabled file.
- network.service doesn't appear to ever have been used, and was probably
  intended to be network.target.
This service is also Before=network-pre.target.
NetworkManager.service is ordered After=network-pre.target
Therefore, this setting is redundant.
This is required by all distros which use DefaultDependencies=no.
It implicitly added by all distros which do not use DefaultDependencies=no.
Therefore, it does no harm to apply it in all cases.
- There is no harm in ordering after a service which doesn't exist.
- Cloud-init's final stage should consistently be ordered with respect to
  multi-user.target on all distros.
…ical#5790)

This replaces the use of `/etc/rc.local` in the OpenBSD build script
by the sysv init scripts provided with cloud-init.

Fixes canonicalGH-4036
LP: #1992853
cloud_style_initialization is now default
patches:
debian/patches/cli-retain-file-argument-as-main-cmd-arg.patch
debian/patches/no-single-process.patch
debian/patches/revert-551f560d-cloud-config-after-snap-seeding.patch
@github-actions github-actions bot added the packaging Supplemental package review requested label Nov 1, 2024
@@ -24,7 +24,7 @@
"id": "cc_grub_dpkg",
"distros": ["ubuntu", "debian"],
"frequency": PER_INSTANCE,
"activate_by_schema_keys": [],
"activate_by_schema_keys": ["grub_dpkg", "grub-dpkg"],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We still need to resolve #5842, but I can do that separately.

@TheRealFalcon TheRealFalcon merged commit 2bf84b4 into canonical:ubuntu/jammy Nov 4, 2024
20 of 21 checks passed
@TheRealFalcon
Copy link
Member Author

Merging as-is to unblock dailies. See #5853

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
packaging Supplemental package review requested
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants