Merge pull request #30477 from Lassulus/encrypted-devices

Encrypted devices: don't override crytpoModules, fix example

authored by Jörg Thalheim and committed by GitHub 68387629 10e79d43

+1 -2
+1 -2
nixos/modules/tasks/encrypted-devices.nix
··· 36 37 keyFile = mkOption { 38 default = null; 39 - example = "/root/.swapkey"; 40 type = types.nullOr types.str; 41 description = "File system location of keyfile. This unlocks the drive after the root has been mounted to <literal>/mnt-root</literal>."; 42 }; ··· 67 luks = { 68 devices = 69 map (dev: { name = dev.encrypted.label; device = dev.encrypted.blkDev; } ) keylessEncDevs; 70 - cryptoModules = [ "aes" "sha256" "sha1" "xts" ]; 71 forceLuksSupportInInitrd = true; 72 }; 73 postMountCommands =
··· 36 37 keyFile = mkOption { 38 default = null; 39 + example = "/mnt-root/root/.swapkey"; 40 type = types.nullOr types.str; 41 description = "File system location of keyfile. This unlocks the drive after the root has been mounted to <literal>/mnt-root</literal>."; 42 }; ··· 67 luks = { 68 devices = 69 map (dev: { name = dev.encrypted.label; device = dev.encrypted.blkDev; } ) keylessEncDevs; 70 forceLuksSupportInInitrd = true; 71 }; 72 postMountCommands =