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

encrypted devices: add label set assertion #29651

Merged
merged 1 commit into from Sep 23, 2017
Merged

encrypted devices: add label set assertion #29651

merged 1 commit into from Sep 23, 2017

Conversation

infinisil
Copy link
Member

@infinisil infinisil commented Sep 21, 2017 •
edited

Motivation for this change

rnhmjoj on IRC found this issue. Now an assertion gets throws when encrypted.enable is set, but encrypted.label isn't.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@infinisil, thanks for your PR! By analyzing the history of the files in this pull request, we identified @edwtjo, @KoviRobi and @oxij to be potential reviewers.

@joachifm joachifm added this to the 17.09 milestone Sep 22, 2017
zimbatm
zimbatm approved these changes Sep 23, 2017
View reviewed changes
Copy link
Member

@zimbatm zimbatm left a comment

Choose a reason for hiding this comment

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

LGTM

@zimbatm zimbatm merged commit eca2323 into NixOS:master Sep 23, 2017
zimbatm pushed a commit that referenced this pull request Sep 23, 2017
@infinisil @zimbatm
encrypted devices: add label set assertion (#29651)
aca6a2b
marcinfalkiewicz
marcinfalkiewicz reviewed Sep 29, 2017
View reviewed changes
nixos/modules/tasks/encrypted-devices.nix
@@ -56,6 +56,13 @@ in
};

config = mkIf anyEncrypted {
assertions = map (dev: {
assertion = dev.label != null;
Copy link
Contributor

Choose a reason for hiding this comment

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

Correct me if I'm wrong, but shouldn't be dev.encrypted.label instead?

Copy link
Member Author

Choose a reason for hiding this comment

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

Good catch! #29926

@infinisil infinisil mentioned this pull request Sep 29, 2017
Closed
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marcinfalkiewicz marcinfalkiewicz marcinfalkiewicz left review comments

@zimbatm zimbatm zimbatm approved these changes

Assignees
No one assigned
Labels
6.topic: nixos
Projects
None yet
Milestone
17.09
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@infinisil @mention-bot @zimbatm @marcinfalkiewicz @joachifm