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

systemd: reintroduce "hostnamed, localed, timedated: disable methods that change system settings" patch #226192

Merged

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Apr 14, 2023

Description of changes

This reintroduces "[PATCH] hostnamed, localed, timedated: disable methods that change system settings."

As explained in #224080, /etc is not read-only, but contains symlinks to the (read-only) /etc/static. We still want to keep that logic.

With this change, nixosTests.timezone succeeds again.

I also batched this PR with a rework of the fsck patch, as we were missing some locations. This now uses the same logic to find fsck, and was sent to upstream in systemd/systemd#27274 (helping with #80038)

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/)
  • 23.05 Release Notes (or backporting 22.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.

This patches some more occurences, addresses upstream feedback, and was
sent upstream at systemd/systemd#27274.
…t-cha.patch

In NixOS, /etc is NOT read-only, and most things in /etc are symlinks
to /etc/static, which is a symlink into the nix store - so the upstream
systemd "/etc is read-only" detection doesn't work.

Fixes NixOS#224080.
Copy link
Contributor

@ElvishJerricco ElvishJerricco left a comment

Choose a reason for hiding this comment

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

LGTM. Happy to see the improvement to the fsck patch as well.

@flokli flokli merged commit 503149b into NixOS:staging Apr 16, 2023
@flokli flokli deleted the systemd-reintroduce-config-method-disable branch April 17, 2023 12:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants