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

nixos/udev: support /run/current-system/systemd in udevRules #88607

Merged
merged 1 commit into from May 22, 2020

Conversation

@flokli
Copy link
Contributor

flokli commented May 22, 2020

#88492 flipped some references to
systemctl from config.systemd.package to /run/current-system/systemd/,
which udevRules obviously isn't able resolve.

If we encounter such references, replace them with
config.systemd.package before doing the check.

Motivation for this change

Unblock the channels.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
#88492 flipped some references to
systemctl from config.systemd.package to /run/current-system/systemd/,
which udevRules obviously isn't able resolve.

If we encounter such references, replace them with
config.systemd.package before doing the check.
@flokli flokli requested a review from vcunat May 22, 2020
@flokli flokli mentioned this pull request May 22, 2020
0 of 10 tasks complete
@flokli
Copy link
Contributor Author

flokli commented May 22, 2020

@GrahamcOfBorg build nixosTests.boot.biosCdrom

@flokli flokli requested review from Mic92 and adisbladis May 22, 2020
@vcunat
vcunat approved these changes May 22, 2020
Copy link
Member

vcunat left a comment

Diff looks OK, the two unstable-small jobs broken on Hydra now succeed (locally).

@flokli flokli merged commit 93ff93d into NixOS:master May 22, 2020
1 check passed
1 check passed
editorconfig editorconfig
Details
@flokli flokli deleted the flokli:udev-rules-run-current-system-systemd branch May 22, 2020
dhess added a commit to hackworthltd/hacknix that referenced this pull request May 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.