diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-09 14:33:52 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-09 14:33:52 +0100 |
| commit | 20f001c01eeddbfd46ba4c5e47a8396a6eb4b08c (patch) | |
| tree | 3165b4e84ec25ad34e2e40995c3fb10fad17f1d5 /nixos/modules/system | |
| parent | 099bb158f91ff67a3c2fa637cb533b44cf17a7da (diff) | |
| parent | f77eb9bb4d5d9ff34c6b1c18274e50d0bdddb652 (diff) | |
| download | nixpkgs-20f001c01eeddbfd46ba4c5e47a8396a6eb4b08c.tar nixpkgs-20f001c01eeddbfd46ba4c5e47a8396a6eb4b08c.tar.gz nixpkgs-20f001c01eeddbfd46ba4c5e47a8396a6eb4b08c.tar.bz2 nixpkgs-20f001c01eeddbfd46ba4c5e47a8396a6eb4b08c.tar.lz nixpkgs-20f001c01eeddbfd46ba4c5e47a8396a6eb4b08c.tar.xz nixpkgs-20f001c01eeddbfd46ba4c5e47a8396a6eb4b08c.tar.zst nixpkgs-20f001c01eeddbfd46ba4c5e47a8396a6eb4b08c.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/boot/luksroot.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/system/boot/pbkdf2-sha512.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 88190e8200b..8dd2ea20519 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -404,7 +404,7 @@ let echo "Please move your mouse to create needed randomness." ''} echo "Waiting for your FIDO2 device..." - fido2luks -i open ${device} ${name} ${fido2.credential} --await-dev ${toString fido2.gracePeriod} --salt string:$passphrase + fido2luks open ${device} ${name} ${fido2.credential} --await-dev ${toString fido2.gracePeriod} --salt string:$passphrase if [ $? -ne 0 ]; then echo "No FIDO2 key found, falling back to normal open procedure" open_normally diff --git a/nixos/modules/system/boot/pbkdf2-sha512.c b/nixos/modules/system/boot/pbkdf2-sha512.c index b40c383ac02..67e989957ba 100644 --- a/nixos/modules/system/boot/pbkdf2-sha512.c +++ b/nixos/modules/system/boot/pbkdf2-sha512.c @@ -35,4 +35,4 @@ int main(int argc, char** argv) fwrite(key, 1, key_length, stdout); return 0; -} \ No newline at end of file +} |