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

update systemd to 250.4 #1983

Merged
merged 3 commits into from
Mar 19, 2022
Merged

Conversation

bcressey
Copy link
Contributor

@bcressey bcressey commented Mar 4, 2022

Issue number:
Fixes #1671, fixes #1815

Description of changes:
Update to the most recent stable release of systemd. Rebase patches to account for upstream changes since 247, and specify the expected set of build options.

Also update libseccomp, since that was held back by the older version of systemd.

Testing done:

Note that I didn't see the issue with dbus-broker startup that was observed in #1671, but I haven't bisected to find the actual fix.

Stable machine IDs confirmed on:

  • EC2 / Nitro
  • EC2 / Xen
  • VMware

Workload tests passed:

  • aws-k8s-1.21 / x86_64
  • aws-ecs-1 / aarch64
  • vmware-k8s-1.21 / x86_64

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

Copy link
Contributor

@zmrow zmrow left a comment

Choose a reason for hiding this comment

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

👯

@@ -118,11 +118,13 @@ CONFIGURE_OPTS=(
-Drepart=true
-Dcoredump=false
-Dpstore=true
-Doomd=false
Copy link
Contributor

Choose a reason for hiding this comment

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

systemd-ood seems like a nice features I wonder if we could use it to set some limits in the units we maintain when we move to cgroups v2 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

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

At one point systemd-oomd required swap, which we don't support today. It's also not obvious how useful it is with kubelet in the picture.

@@ -242,6 +268,7 @@ install -p -m 0644 %{S:4} %{buildroot}%{_cross_factorydir}%{_cross_sysconfdir}/i
%{_cross_bindir}/systemd-cat
%{_cross_bindir}/systemd-cgls
%{_cross_bindir}/systemd-cgtop
%{_cross_bindir}/systemd-creds
Copy link
Contributor

Choose a reason for hiding this comment

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

Are we planning to pass credentials to systemd units? Otherwise, should this be excluded with %exclude or installed in other subpackage?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm interested in this as a potential future direction, and wanted it enabled to facilitate that. Similar story to systemd-repart which we ended up using.

@bcressey bcressey marked this pull request as ready for review March 14, 2022 19:06
@bcressey bcressey marked this pull request as draft March 14, 2022 21:45
@bcressey
Copy link
Contributor Author

systemd-stable 250.4 is out, so I'm moving this back to draft while I review the changes there.

@bcressey
Copy link
Contributor Author

(rebase only)

This fixes a deprecation warning in the new version of `meson`, which
now prefers language options in the `[built-in options]` section.

Signed-off-by: Ben Cressey <bcressey@amazon.com>
Upstream reworked the VM detection logic for generating machine IDs,
and now detects the Amazon EC2 Nitro hypervisor. We still carry the
patch to generate machine IDs for Xen and VMware.

repart no longer depends on OpenSSL as of ade99252e, so we can drop
that patch.

Update the meson build options to make most choices explicit, and to
cover options added over the last few releases. This tidies up the
list of excluded files by not building components like oomd in the
first place.

Signed-off-by: Ben Cressey <bcressey@amazon.com>
Signed-off-by: Ben Cressey <bcressey@amazon.com>
@bcressey
Copy link
Contributor Author

(switch to systemd 250.4, add libseccomp 2.5.3 update)

@bcressey bcressey changed the title update systemd to 250.3 update systemd to 250.4 Mar 15, 2022
@bcressey bcressey marked this pull request as ready for review March 16, 2022 16:09
Copy link
Contributor

@arnaldo2792 arnaldo2792 left a comment

Choose a reason for hiding this comment

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

🎉

@bcressey bcressey merged commit 0e15b34 into bottlerocket-os:develop Mar 19, 2022
@bcressey bcressey deleted the systemd-bump branch March 19, 2022 16:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update libseccomp to 2.53+ Update systemd
6 participants