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

systemd: don't taint on unmerged /usr #194331

Merged
merged 2 commits into from
Oct 4, 2022
Merged

systemd: don't taint on unmerged /usr #194331

merged 2 commits into from
Oct 4, 2022

Conversation

oxalica
Copy link
Contributor

@oxalica oxalica commented Oct 4, 2022 •
edited
Loading

Description of changes

Fixes #184826
Discussion: systemd/systemd#24191 (comment)

I'm still running the build. It may take some time.
systemd builds and works as expected.

r? @flokli

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.11 Release Notes (or backporting 22.05 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@oxalica oxalica requested a review from a team as a code owner October 4, 2022 01:47
@ofborg ofborg bot requested review from Mic92, kloenk and flokli October 4, 2022 03:18
flokli
flokli reviewed Oct 4, 2022
View reviewed changes
Copy link
Contributor

@flokli flokli left a comment

Choose a reason for hiding this comment

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

Overall LGTM. Can you add a test to not see unmerged-usr in a "Tainted:" line in systemctl status output to nixosTests.systemd?

pkgs/os-specific/linux/systemd/0018-core-don-t-taint-on-unmerged-usr.patch Outdated Show resolved Hide resolved
@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Oct 4, 2022
@oxalica oxalica requested a review from flokli October 4, 2022 17:04
@flokli
Copy link
Contributor

flokli commented Oct 4, 2022

Thanks!

@flokli flokli merged commit 9b630a2 into NixOS:staging Oct 4, 2022
@oxalica oxalica deleted the fix/systemd-unmerged-usr branch October 4, 2022 18:31
@flokli flokli mentioned this pull request Oct 8, 2022
Closed
@flokli flokli mentioned this pull request Dec 8, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Awaiting requested review from Mic92

@kloenk kloenk Awaiting requested review from kloenk

@flokli flokli Awaiting requested review from flokli

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: systemd 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@oxalica @flokli