diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-06-12 09:22:07 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-06-12 09:22:07 +0200 |
| commit | 7184efb40af0e740000e678a727922a7f58ac597 (patch) | |
| tree | 2dcb3900446f284697be5c2c5a2d4696d2d87bcb /nixos/modules/system | |
| parent | 3df5b67ae4348b22318f92bdb7d00cb5655495d8 (diff) | |
| parent | 9edf8f73f76b21f7443123cc1a6fca76c5eed3b1 (diff) | |
| download | nixlib-7184efb40af0e740000e678a727922a7f58ac597.tar nixlib-7184efb40af0e740000e678a727922a7f58ac597.tar.gz nixlib-7184efb40af0e740000e678a727922a7f58ac597.tar.bz2 nixlib-7184efb40af0e740000e678a727922a7f58ac597.tar.lz nixlib-7184efb40af0e740000e678a727922a7f58ac597.tar.xz nixlib-7184efb40af0e740000e678a727922a7f58ac597.tar.zst nixlib-7184efb40af0e740000e678a727922a7f58ac597.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/boot/luksroot.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 9dcb683eff43..b5c8d5241a3d 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -438,6 +438,7 @@ in default = [ "aes" "aes_generic" "blowfish" "twofish" "serpent" "cbc" "xts" "lrw" "sha1" "sha256" "sha512" + "af_alg" "algif_skcipher" (if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then "aes_x86_64" else "aes_i586") ]; |