diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-06-12 05:05:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-12 05:05:38 +0000 |
| commit | 9b2ee2c0573db815572dfa5a076bf73aa77edf56 (patch) | |
| tree | 0d0393bd0357d28d145f6f1b068dab7db85392ab /nixos | |
| parent | e4612862d20ca0d44421f03cae672bcfdc39f218 (diff) | |
| parent | c51786bd5dab8156956852342594a1d43a6985da (diff) | |
Merge pull request #62838 from mayflower/fix/cryptsetup-kernel-crypto
cryptsetup: enable kernel crypto api support again
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/luksroot.nix | 1 | ||||
| -rw-r--r-- | nixos/tests/installer.nix | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 9dcb683eff438..b5c8d5241a3db 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") ]; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 5e363f5d09e9e..07659b60b3b8b 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -273,7 +273,7 @@ let }; }; - makeLuksRootTest = name: luksFormatOpts: makeInstallerTest "luksroot-format2" + makeLuksRootTest = name: luksFormatOpts: makeInstallerTest name { createPartitions = '' $machine->succeed( "flock /dev/vda parted --script /dev/vda -- mklabel msdos" |