* Make the boot.initrd.luks.enable option obsolete. It's enough to
see that boot.initrd.luks.devices is non-empty. svn path=/nixos/trunk/; revision=34120
This commit is contained in:
parent
28cc602751
commit
07fcf5baee
|
@ -33,15 +33,13 @@ in
|
|||
options = {
|
||||
boot.initrd.luks.enable = mkOption {
|
||||
default = false;
|
||||
description = '';
|
||||
Have luks in the initrd.
|
||||
'';
|
||||
description = "Obsolete.";
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices = mkOption {
|
||||
default = [ ];
|
||||
example = [ { name = "luksroot"; device = "/dev/sda3"; preLVM = true; } ];
|
||||
description = '';
|
||||
description = ''
|
||||
The list of devices that should be decrypted using LUKS before trying to mount the
|
||||
root partition. This works for both LVM-over-LUKS and LUKS-over-LVM setups.
|
||||
|
||||
|
@ -75,7 +73,7 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
config = mkIf luks.enable {
|
||||
config = mkIf (luks.devices != []) {
|
||||
|
||||
# Some modules that may be needed for mounting anything ciphered
|
||||
boot.initrd.kernelModules = [ "aes_generic" "aes_x86_64" "dm_mod" "dm_crypt"
|
||||
|
|
Loading…
Reference in a new issue