From 07fcf5baee001ad0cc07155b0791c1bc68114ef5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 May 2012 20:45:01 +0000 Subject: [PATCH] * 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 --- modules/system/boot/luksroot.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/system/boot/luksroot.nix b/modules/system/boot/luksroot.nix index 7f9898770a9..ff11d284ef8 100644 --- a/modules/system/boot/luksroot.nix +++ b/modules/system/boot/luksroot.nix @@ -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"