From f804a8ff98b4a2550d4e854fa7506e1fe56d33d6 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 16 Oct 2017 17:46:06 +0200 Subject: [PATCH 1/2] encrypted devices: don't override default cryptoModules --- nixos/modules/tasks/encrypted-devices.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix index 6bbf335e7db..0b4c41a0f2a 100644 --- a/nixos/modules/tasks/encrypted-devices.nix +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -67,7 +67,6 @@ in luks = { devices = map (dev: { name = dev.encrypted.label; device = dev.encrypted.blkDev; } ) keylessEncDevs; - cryptoModules = [ "aes" "sha256" "sha1" "xts" ]; forceLuksSupportInInitrd = true; }; postMountCommands = From 77be4d91f7448636749049672dc78c0d08ea3d45 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 16 Oct 2017 17:46:46 +0200 Subject: [PATCH 2/2] encrypted devices: provide working example --- nixos/modules/tasks/encrypted-devices.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix index 0b4c41a0f2a..da0c9408d89 100644 --- a/nixos/modules/tasks/encrypted-devices.nix +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -36,7 +36,7 @@ let keyFile = mkOption { default = null; - example = "/root/.swapkey"; + example = "/mnt-root/root/.swapkey"; type = types.nullOr types.str; description = "File system location of keyfile. This unlocks the drive after the root has been mounted to /mnt-root."; };