Author: eelco
Date: Tue May 15 20:45:01 2012
New Revision: 34120
URL: https://nixos.org/websvn/nix/?rev=34120&sc=1
Log:
* Make the boot.initrd.luks.enable option obsolete. It's enough to
see that boot.initrd.luks.devices is non-empty.
Modified:
nixos/trunk/modules/system/boot/luksroot.nix
Modified: nixos/trunk/modules/system/boot/luksroot.nix
==============================================================================
--- nixos/trunk/modules/system/boot/luksroot.nix Tue May 15 20:42:13
2012 (r34119)
+++ nixos/trunk/modules/system/boot/luksroot.nix Tue May 15 20:45:01
2012 (r34120)
@@ -33,15 +33,13 @@
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 @@
};
};
- 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"
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
