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: add the modprobe service #115584

Merged
merged 2 commits into from
Mar 9, 2021
Merged

systemd: add the modprobe service #115584

merged 2 commits into from
Mar 9, 2021

Conversation

grahamc
Copy link
Member

@grahamc grahamc commented Mar 9, 2021

Motivation for this change

The iscsi package's unit depends on modprobe@.service, which unfortunately requires patching.

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.

grahamc added 2 commits March 9, 2021 12:38
@grahamc
systemd: correct path to modprobe@.service
e7d9750 
The unit hard-codes a path to modprobe which is obviously invalid.
@grahamc
nixos/systemd: bring in modprobe@.service
0b52c40 
It is broken: it looks for /sbin/modprobe, but it works anyway??
@grahamc grahamc requested review from flokli and andir March 9, 2021 17:41
flokli
flokli requested changes Mar 9, 2021
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.

This needs to target staging, as it causes a systemd rebuild.

Also, can you exercise the unit in some VM test? I assume manually starting a modprobe@….service should suffice.

@grahamc grahamc changed the base branch from master to staging March 9, 2021 17:58
@grahamc
Copy link
Member Author

grahamc commented Mar 9, 2021

Whoops, I targeted staging, closed the tab, reopened the tab, write the description, and then forgot to target staging 🙃.

I have another PR about to be submitted which exercises it, I'll link it when it is open.

@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: systemd 8.has: module (update) This PR changes an existing module in `nixos/` labels Mar 9, 2021
@ofborg ofborg bot requested review from edolstra, kloenk and flokli March 9, 2021 18:07
@grahamc grahamc mentioned this pull request Mar 9, 2021
Merged
10 tasks
@grahamc
Copy link
Member Author

grahamc commented Mar 9, 2021

A service that exercises modprobe@ has a test in #115590

@flokli flokli merged commit 7db55b3 into NixOS:staging Mar 9, 2021
@grahamc grahamc deleted the systemd-modprobe-service branch March 10, 2021 14:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flokli flokli flokli approved these changes

@andir andir Awaiting requested review from andir

@edolstra edolstra Awaiting requested review from edolstra

@kloenk kloenk Awaiting requested review from kloenk

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: systemd 8.has: module (update) This PR changes an existing module in `nixos/` 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
@grahamc @flokli