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/luksroot: Support keyfile offsets #41425

Merged
merged 1 commit into from Aug 7, 2018
Merged

nixos/luksroot: Support keyfile offsets #41425

merged 1 commit into from Aug 7, 2018

Conversation

dasJ
Copy link
Member

@dasJ dasJ commented Jun 3, 2018

Motivation for this change

I'd like to use a raw partition as keyfile for multiple disks, so I need to offset each key from the previous one.

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

example = 4096;
type = types.nullOr types.int;
description = ''
The offset of the key file. Use this in combination with
Copy link
Contributor

Choose a reason for hiding this comment

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

Minor nitpicks, but:

  • You've got an extra space after "Use this"
  • "use part of a file as key" - do you mean "as the key"?
  • "is used as key file" - you may mean "used as a key file"?

Copy link
Member Author

Choose a reason for hiding this comment

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

I fixed what I think was wrong. "as the key" would be wrong because it's not actually used as key, but as key file. I hope you are happy with the changed version

@dasJ
Copy link
Member Author

dasJ commented Jul 30, 2018

@andrew-d Fixed and rebased

@infinisil
Copy link
Member

Can you squash both commits into 1?

@dasJ
Copy link
Member Author

dasJ commented Aug 7, 2018

@infinisil Squashed and rebased to master

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.

None yet

4 participants