pyrox.dev
attempt to fix #30940 more robustly
+4
-5
nixos/modules/system/boot/luksroot.nix
+4
-5
nixos/modules/system/boot/luksroot.nix
···
228
228
[ "aes" "aes_generic" "blowfish" "twofish"
229
229
"serpent" "cbc" "xts" "lrw" "sha1" "sha256" "sha512"
230
230
231
-
# workaround until https://marc.info/?l=linux-crypto-vger&m=148783562211457&w=4 is merged
232
-
# remove once 'modprobe --show-depends xts' shows ecb as a dependency
233
-
"ecb"
234
-
235
231
(if pkgs.stdenv.system == "x86_64-linux" then "aes_x86_64" else "aes_i586")
236
232
];
237
233
description = ''
···
441
437
# Some modules that may be needed for mounting anything ciphered
442
438
# Also load input_leds to get caps lock light working (#12456)
443
439
boot.initrd.availableKernelModules = [ "dm_mod" "dm_crypt" "cryptd" "input_leds" ]
444
-
++ luks.cryptoModules;
440
+
++ luks.cryptoModules
441
+
# workaround until https://marc.info/?l=linux-crypto-vger&m=148783562211457&w=4 is merged
442
+
# remove once 'modprobe --show-depends xts' shows ecb as a dependency
443
+
++ (if builtins.elem "xts" luks.cryptoModules then ["ecb"] else []);
445
444
446
445
# copy the cryptsetup binary and it's dependencies
447
446
boot.initrd.extraUtilsCommands = ''