diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-02-26 22:55:11 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-02-26 22:55:11 +0100 |
commit | 6168c2e45f7dc17a237e4752eb4ee1dbb56f6a56 (patch) | |
tree | d6d622661e222045811f5bb26d441bb1fd7752f7 /nixos | |
parent | b92d9945015d40a76a6ce5a84ef0e49098f15faa (diff) | |
parent | e2243a5ac95826b5b8c23c77c3562d81e5146b29 (diff) | |
download | nixpkgs-6168c2e45f7dc17a237e4752eb4ee1dbb56f6a56.tar nixpkgs-6168c2e45f7dc17a237e4752eb4ee1dbb56f6a56.tar.gz nixpkgs-6168c2e45f7dc17a237e4752eb4ee1dbb56f6a56.tar.bz2 nixpkgs-6168c2e45f7dc17a237e4752eb4ee1dbb56f6a56.tar.lz nixpkgs-6168c2e45f7dc17a237e4752eb4ee1dbb56f6a56.tar.xz nixpkgs-6168c2e45f7dc17a237e4752eb4ee1dbb56f6a56.tar.zst nixpkgs-6168c2e45f7dc17a237e4752eb4ee1dbb56f6a56.zip |
Merge master into staging
This is to cleanup the (re-)revert of merge to master.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/system/boot/luksroot.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index eefee5a479e..8b390e1b60c 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -228,10 +228,6 @@ in [ "aes" "aes_generic" "blowfish" "twofish" "serpent" "cbc" "xts" "lrw" "sha1" "sha256" "sha512" - # workaround until https://marc.info/?l=linux-crypto-vger&m=148783562211457&w=4 is merged - # remove once 'modprobe --show-depends xts' shows ecb as a dependency - "ecb" - (if pkgs.stdenv.system == "x86_64-linux" then "aes_x86_64" else "aes_i586") ]; description = '' @@ -441,7 +437,10 @@ in # Some modules that may be needed for mounting anything ciphered # Also load input_leds to get caps lock light working (#12456) boot.initrd.availableKernelModules = [ "dm_mod" "dm_crypt" "cryptd" "input_leds" ] - ++ luks.cryptoModules; + ++ luks.cryptoModules + # workaround until https://marc.info/?l=linux-crypto-vger&m=148783562211457&w=4 is merged + # remove once 'modprobe --show-depends xts' shows ecb as a dependency + ++ (if builtins.elem "xts" luks.cryptoModules then ["ecb"] else []); # copy the cryptsetup binary and it's dependencies boot.initrd.extraUtilsCommands = '' |