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

nixos/binfmt: fix race condition between systemd-tmpfiles and systemd-binfmt #295370

Merged
merged 1 commit into from
Mar 13, 2024
Merged

nixos/binfmt: fix race condition between systemd-tmpfiles and systemd-binfmt #295370

merged 1 commit into from
Mar 13, 2024

Conversation

arianvp
Copy link
Member

@arianvp arianvp commented Mar 12, 2024 •
edited
Loading

Description of changes

We need to make sure systemd-tmpfiles-setup.service ran before we start systemd-binft.service. Otherwise it might fail to start due to non-existant files

Fixes #295365

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@arianvp arianvp requested a review from dasJ as a code owner March 12, 2024 17:26
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Mar 12, 2024
@arianvp
Copy link
Member Author

arianvp commented Mar 12, 2024

I have a related question though.

Shouldn't we make sure that systemd-tmpfiles-resetup.service is pulled in by all systemd units that depend on systemd-tmpfiles-setup.service too?

Those being:

./units/systemd-journal-catalog-update.service:After=local-fs.target systemd-tmpfiles-setup.service
./units/systemd-journal-flush.service:Before=systemd-tmpfiles-setup.service
./units/systemd-firstboot.service:After=systemd-sysusers.service systemd-tmpfiles-setup.service
./units/systemd-sysext.service:Before=sysinit.target systemd-tmpfiles-setup.service
./units/systemd-confext.service:Before=sysinit.target systemd-tmpfiles-setup.service

@arianvp arianvp requested review from nikstur and a team March 12, 2024 17:28
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Mar 12, 2024
@arianvp
nixos/binfmt: fix race condition between systemd-tmpfiles and systemd…
16526f4 
…-binfmt

We need to make sure systemd-tmpfiles-setup.service ran before we
start systemd-binft.service. Otherwise it might fail to start
due to non-existant files

Fixes NixOS#295365
nikstur
nikstur approved these changes Mar 13, 2024
View reviewed changes
Copy link
Contributor

@nikstur nikstur left a comment

Choose a reason for hiding this comment

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

This is something we should probably upstream. Seems like a general use case to let tmpfiles setup files for binfmt.

@nikstur
Copy link
Contributor

nikstur commented Mar 13, 2024

@ofborg test systemd-binfmt

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Mar 13, 2024
@nikstur nikstur merged commit 7f175e6 into NixOS:master Mar 13, 2024
23 of 25 checks passed
@github-actions GitHub Actions
Copy link
Contributor

Successfully created backport PR for release-23.11:

@github-actions github-actions bot mentioned this pull request Mar 13, 2024
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ElvishJerricco ElvishJerricco ElvishJerricco left review comments

@nikstur nikstur nikstur approved these changes

@dasJ dasJ Awaiting requested review from dasJ

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Race condition between systemd-binfmt and systemd-tmpfiles when using boot.binfmt
4 participants
@arianvp @nikstur @ElvishJerricco @delroth